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 2018/05/17 20:05:23 UTC
[01/50] [abbrv] tinkerpop git commit: TINKERPOP-1943 Support
GraphSON3 in Gremlin-JavaScript [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1956 a937287d9 -> 20a722a35 (forced update)
TINKERPOP-1943 Support GraphSON3 in Gremlin-JavaScript
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9357c9e5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9357c9e5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9357c9e5
Branch: refs/heads/TINKERPOP-1956
Commit: 9357c9e567cea65522db2ca109f427c27a999c06
Parents: 8005cb3
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Wed Apr 25 14:22:25 2018 +0200
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Wed Apr 25 14:22:25 2018 +0200
----------------------------------------------------------------------
.../lib/driver/driver-remote-connection.js | 2 +-
.../lib/structure/io/graph-serializer.js | 11 ++-
.../lib/structure/io/type-serializers.js | 81 ++++++++++++++++++++
.../test/cucumber/feature-steps.js | 4 +-
.../gremlin-javascript/test/cucumber/world.js | 10 +--
5 files changed, 96 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9357c9e5/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
index d9e6000..ac148a3 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/driver-remote-connection.js
@@ -33,7 +33,7 @@ const responseStatusCode = {
noContent: 204,
partialContent: 206
};
-const defaultMimeType = 'application/vnd.gremlin-v2.0+json';
+const defaultMimeType = 'application/vnd.gremlin-v3.0+json';
class DriverRemoteConnection extends RemoteConnection {
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9357c9e5/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
index df05659..df64e41 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
@@ -159,8 +159,11 @@ const deserializers = {
'g:Edge': typeSerializers.EdgeSerializer,
'g:VertexProperty': typeSerializers.VertexPropertySerializer,
'g:Property': typeSerializers.PropertySerializer,
- 'g:Path': typeSerializers.PathSerializer,
- 'g:T': typeSerializers.TSerializer
+ 'g:Path': typeSerializers.Path3Serializer,
+ 'g:T': typeSerializers.TSerializer,
+ 'g:List': typeSerializers.ListSerializer,
+ 'g:Set': typeSerializers.SetSerializer,
+ 'g:Map': typeSerializers.MapSerializer
};
const serializers = [
@@ -172,7 +175,9 @@ const serializers = [
typeSerializers.EnumSerializer,
typeSerializers.VertexSerializer,
typeSerializers.EdgeSerializer,
- typeSerializers.LongSerializer
+ typeSerializers.LongSerializer,
+ typeSerializers.ListSerializer,
+ typeSerializers.MapSerializer
];
module.exports = {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9357c9e5/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
index 304888f..3b2b9e6 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/type-serializers.js
@@ -270,22 +270,103 @@ class PathSerializer extends TypeSerializer {
}
}
+class Path3Serializer extends TypeSerializer {
+ deserialize(obj) {
+ const value = obj[valueKey];
+ return new g.Path(this.reader.read(value['labels']), this.reader.read(value['objects']));
+ }
+}
+
class TSerializer extends TypeSerializer {
deserialize(obj) {
return t.t[obj[valueKey]];
}
}
+class ArraySerializer extends TypeSerializer {
+ constructor(typeKey) {
+ super();
+ this.typeKey = typeKey;
+ }
+
+ deserialize(obj) {
+ const value = obj[valueKey];
+ if (!Array.isArray(value)) {
+ throw new Error('Expected Array, obtained: ' + value);
+ }
+ return value.map(x => this.reader.read(x));
+ }
+
+ /** @param {Array} item */
+ serialize(item) {
+ return {
+ [typeKey]: this.typeKey,
+ [valueKey]: item.map(x => this.writer.adaptObject(x))
+ };
+ }
+
+ canBeUsedFor(value) {
+ return Array.isArray(value);
+ }
+}
+
+class MapSerializer extends TypeSerializer {
+ deserialize(obj) {
+ const value = obj[valueKey];
+ if (!Array.isArray(value)) {
+ throw new Error('Expected Array, obtained: ' + value);
+ }
+ const result = new Map();
+ for (let i = 0; i < value.length; i += 2) {
+ result.set(this.reader.read(value[i]), this.reader.read(value[i + 1]));
+ }
+ return result;
+ }
+
+ /** @param {Map} map */
+ serialize(map) {
+ const arr = [];
+ map.forEach((v, k) => {
+ arr.push(this.writer.adaptObject(k));
+ arr.push(this.writer.adaptObject(v));
+ });
+ return {
+ [typeKey]: 'g:Map',
+ [valueKey]: arr
+ };
+ }
+
+ canBeUsedFor(value) {
+ return value instanceof Map;
+ }
+}
+
+class ListSerializer extends ArraySerializer {
+ constructor() {
+ super('g:List');
+ }
+}
+
+class SetSerializer extends ArraySerializer {
+ constructor() {
+ super('g:Set');
+ }
+}
+
module.exports = {
BytecodeSerializer,
EdgeSerializer,
EnumSerializer,
LambdaSerializer,
+ ListSerializer,
LongSerializer,
+ MapSerializer,
NumberSerializer,
+ Path3Serializer,
PathSerializer,
PropertySerializer,
PSerializer,
+ SetSerializer,
TSerializer,
TraverserSerializer,
typeKey,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9357c9e5/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index d774754..047856f 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@ -37,7 +37,7 @@ const t = traversalModule.t;
// Determines whether the feature maps (m[]), are deserialized as objects (true) or maps (false).
// Use false for GraphSON3.
-const mapAsObject = true;
+const mapAsObject = false;
const parsers = [
[ 'd\\[([\\d.]+)\\]\\.[ilfdm]', toNumeric ],
@@ -233,7 +233,7 @@ function toNumeric(stringValue) {
}
function toVertex(name) {
- return this.getData().vertices[name];
+ return this.getData().vertices.get(name);
}
function toVertexId(name) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9357c9e5/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
index f531720..269e20a 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/world.js
@@ -111,16 +111,14 @@ function getEdges(connection) {
.next()
.then(it => {
const edges = {};
- Object.keys(it.value).map(key => {
- edges[getEdgeKey(key)] = it.value[key];
+ it.value.forEach((v, k) => {
+ edges[getEdgeKey(k)] = v;
});
return edges;
});
}
function getEdgeKey(key) {
- const o = /o=(.+?)[,}]/.exec(key)[1];
- const l = /l=(.+?)[,}]/.exec(key)[1];
- const i = /i=(.+?)[,}]/.exec(key)[1];
- return o + "-" + l + "->" + i;
+ // key is a map
+ return key.get('o') + "-" + key.get('l') + "->" + key.get('i');
}
\ No newline at end of file
[15/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4e3a0a9b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4e3a0a9b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4e3a0a9b
Branch: refs/heads/TINKERPOP-1956
Commit: 4e3a0a9bc5b72d7d98cb4b95d647f62dea23c9ee
Parents: 2d39f9b 2f8f74a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 8 12:43:51 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 8 12:43:51 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
[31/50] [abbrv] tinkerpop git commit: Polish up the release docs a
bit for 3.2.x
Posted by sp...@apache.org.
Polish up the release docs a bit for 3.2.x
Not sure why we kinda let those docs die a bit. I think that maybe I figured that we'd always use the /current docs for release but that's not realistic. We probably should try to keep release docs stable to the version being released. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cc7d2e24
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cc7d2e24
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cc7d2e24
Branch: refs/heads/TINKERPOP-1956
Commit: cc7d2e24e1fcac3adfb34fe9b0429458e22f4ad1
Parents: 288b455
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 08:51:44 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 09:01:09 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 59 +++++++++++++++++-----------
1 file changed, 36 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cc7d2e24/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 608bb31..1a7ef82 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -180,22 +180,30 @@ formatted properly - the easiest way to is to view the `CHANGELOG.asciidoc` to b
GitHub viewer.
.. Generate the JIRA release notes report for the current version and append them to the `CHANGELOG.asciidoc`.
... Use an "advanced" search to filter out JIRA issues already released on other versions. For example:
-`project = TINKERPOP and status = Closed AND fixVersion = 3.2.0 AND fixVersion not in (3.1.3, 3.1.2, 3.1.1, 3.1.0) ORDER BY type, Id ASC`.
+`project = TINKERPOP and status = Closed AND fixVersion = 3.2.0 ORDER BY type, Id ASC`.
... Consider use of an "Excel" export to organize and prepare the JIRA tickets to be pasted to `CHANGELOG.asciidoc`.
This formula can help construct each line item for the CHANGELOG if column `A` is the issue number, `B` is the
issue title and `D` is the label field: `="* "&A2&" "&B2&(IF(D2="breaking"," \*(breaking)*",""))`
... Be sure to include a link to other versions in the `CHANGELOG.asciidoc` that were previously released while the
current release was under development as this new release will have those changes included within it. Please see
3.2.1 for an example.
-.. Format "breaking" changes to be clearly marked (use JIRA and the "breaking" label to identify those)
+.. Format "breaking" changes to be clearly marked (use JIRA and the "breaking" label to identify those - already accounted for if using the suggested formula above)
. Update "upgrade documentation":
.. Update the release date.
.. Update the link to `CHANGELOG.asciidoc` - this link may already be correct but will not exist until the repository is tagged.
+. Update homepage with references in `/site` to latest distribution and to other internal links elsewhere on the page.
+.. This step should only be performed by the release manager for the newest line of code (i.e. if release 3.3.x, 3.2.x and 3.1.x,
+then only do this step for 3.3.x (tp33 branch), and update the site for all releases).
+.. Update the `template/header-footer.html`.
+.. Update `index.html`.
+.. Update link:http://tinkerpop.apache.org/downloads.html[Downloads] page, when moving "Current Releases" to "Archived
+Releases" recall that the hyperlink must change to point to version in the link:https://archive.apache.org/dist/tinkerpop/[Apache Archives].
+.. Preview changes locally with `bin/generate-home.sh` then commit changes to git.
. `mvn versions:set -DnewVersion=xx.yy.zz -DgenerateBackupPoms=false` to update project files to reference the non-SNAPSHOT version
. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-standalone/bin/gremlin.sh gremlin.sh; popd`
. `git diff` and review the updated files
. `mvn clean install` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
-.. This step should update the Gremlin.Net project file with the newly bumped version.
+.. This step should update the Gremlin.Net project file and Gremlin Javascript package file with the newly bumped version.
. `git commit -a -m "TinkerPop xx.yy.zz release"` and push
. `bin/process-docs.sh` and validate the generated documentation locally. Don't rely on "BUILD SUCCESS" - scroll up through logs to ensure there were no errors and view the HTML directly. Code blocks that did not execute properly have a gray background and do not show the results of the commands.
. `bin/publish-docs.sh <username>` - Note that this step requires no additional processing as the previous step handled
@@ -209,26 +217,12 @@ for generating javadoc and without that the binary distributions won't contain t
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-console/xx.yy.zz/gremlin-console-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/xx.yy.zz/gremlin-server-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/xx.yy.zz/tinkerpop-xx.yy.zz-source-release.zip* dev/xx.yy.zz`
-.. `rm -f dev/*.md5
+.. `rm -f dev/*.md5`
.. `cd dev/xx.yy.zz`
.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e 's/tinkerpop-tinkerpop/tinkerpop/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
.. `cd ..; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
. Execute `bin/validate-distribution.sh` and any other relevant testing.
. `git tag -a -m "TinkerPop xx.yy.zz release" xx.yy.zz` and `git push --tags`
-. Perform JIRA administration tasks:
-.. "Release" the current version and set the "release date"
-.. If there is to be a follow on release in the current line of code, create that new version specifying the "start date"
-. Prepare Git administration tasks. Note that this work can be performed at the release manager's discretion. It may be wise to wait until a successful VOTE is eminent before reopening development. Apply the following steps as needed per release branch:
-.. Make the appropriate branching changes as required by the release and bump the version to `SNAPSHOT` with
-`mvn versions:set -DnewVersion=xx.yy.zz-SNAPSHOT -DgenerateBackupPoms=false`.
-.. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-SNAPSHOT-standalone/bin/gremlin.sh gremlin.sh; popd`
-.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version.
-.. `mvn clean install -DskipTests` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
-.. `mvn deploy -DskipTests` - deploy the new `SNAPSHOT`
-.. `bin/process-docs.sh` and validate the generated `SNAPSHOT` documentation locally and then `bin/publish-docs.sh <username>`
-.. Commit and push the `SNAPSHOT` changes to git
-.. Send email to advise that code freeze is lifted.
-.. Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review, then once consensus is reached removed those branches.
. Submit for `[VOTE]` at `dev@tinkerpop.apache.org` (see email template below)
. *Wait for vote acceptance* (72 hours)
@@ -248,11 +242,7 @@ for generating javadoc and without that the binary distributions won't contain t
. Wait for Apache Sonatype to sync the artifacts to Maven Central at (link:http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/[http://repo1.maven.org/maven2/org/apache/tinkerpop/tinkerpop/]).
. Report the release through link:https://reporter.apache.org/addrelease.html?tinkerpop[reporter.apache.org] (an email reminder should arrive shortly following the svn command above to do the release)
. Wait for zip distributions to to sync to the Apache mirrors (i.e ensure the download links work from a mirror).
-. Update home page site with references to latest distribution - specifically:
-.. Update the `template/header-footer.html`.
-.. Update `index.html`.
-.. Update link:http://tinkerpop.apache.org/downloads.html[Downloads] page, when moving "Current Releases" to "Archived
-Releases" recall that the hyperlink must change to point to version in the link:https://archive.apache.org/dist/tinkerpop/[Apache Archives].
+. `bin/publish-home.sh <username>` to publish the updated web site with new releases.
. Execute `bin/update-current-docs.sh` to migrate to the latest documentation set for `/current`.
. This step should only occur after the website is updated and all links are working. If there are releases present in
SVN that represents lines of code that are no longer under development, then remove those releases. In other words,
@@ -260,6 +250,29 @@ if `3.2.0` is present and `3.2.1` is released then remove `3.2.0`. However, if
code is still under potential development, it may stay.
. Announce release on `dev@`/`gremlin-users@` mailing lists and tweet from `@apachetinkerpop`
+== Post-release Tasks
+
+A number of administration tasks should be taken care of after release is public. Some of these items can be performed
+during the VOTE period at the release manager's discretion, though it may be wise to wait until a successful VOTE is
+eminent before reopening development. When there are multiple release managers, it's best to coordinate these tasks
+as one individual may simply just handle them all.
+
+. Perform JIRA administration tasks:
+.. "Release" the current version and set the "release date"
+.. If there is to be a follow on release in the current line of code, create that new version specifying the "start date"
+. Prepare Git administration tasks. Apply the following steps as needed per release branch:
+.. Make the appropriate branching changes as required by the release and bump the version to `SNAPSHOT` with
+`mvn versions:set -DnewVersion=xx.yy.zz-SNAPSHOT -DgenerateBackupPoms=false`.
+.. `pushd gremlin-console/bin; ln -fs ../target/apache-tinkerpop-gremlin-console-xx.yy.zz-SNAPSHOT-standalone/bin/gremlin.sh gremlin.sh; popd`
+.. Update CHANGELOG and upgrade docs to have the appropriate headers for the next version.
+.. `mvn clean install -DskipTests` - need to build first so that the right version of the console is used with `bin/publish-docs.sh`
+.. `mvn deploy -DskipTests` - deploy the new `SNAPSHOT`
+.. `bin/process-docs.sh` and validate the generated `SNAPSHOT` documentation locally and then `bin/publish-docs.sh <username>`
+.. Commit and push the `SNAPSHOT` changes to git
+. Send email to advise that code freeze is lifted.
+. Generate a list of dead branches that will be automatically deleted and post them as a DISCUSS thread for review,
+then once consensus is reached removed those branches.
+
== Email Templates
=== Release VOTE
[18/50] [abbrv] tinkerpop git commit: Fixed version typo in upgrade
docs CTR
Posted by sp...@apache.org.
Fixed version typo in upgrade docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e5749062
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e5749062
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e5749062
Branch: refs/heads/TINKERPOP-1956
Commit: e57490625074457bd771bf326967f9db115706ae
Parents: fa5e7af
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 11:55:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 10 11:55:03 2018 -0400
----------------------------------------------------------------------
docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e5749062/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index e6c15cd..468616b 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -21,7 +21,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
*Gremlin Symphony #40 in G Minor*
-== TinkerPop 3.3.2
+== TinkerPop 3.3.3
*Release Date: May 8, 2018*
[32/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
docs/src/dev/developer/release.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/044cd1f4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/044cd1f4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/044cd1f4
Branch: refs/heads/TINKERPOP-1956
Commit: 044cd1f47f18e612d9bef3ba85edacc24909b142
Parents: 906f244 cc7d2e2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 09:04:58 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 09:04:58 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/044cd1f4/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
[45/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1841'
into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1841' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/699a5aa6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/699a5aa6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/699a5aa6
Branch: refs/heads/TINKERPOP-1956
Commit: 699a5aa63942c49ea677d311062d05095866a7ed
Parents: 4adca20 a2feb2a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 15 15:41:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 15 15:41:59 2018 -0400
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[42/50] [abbrv] tinkerpop git commit: TINKERPOP-1841 Configure python
tests in travis
Posted by sp...@apache.org.
TINKERPOP-1841 Configure python tests in travis
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a2feb2a5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a2feb2a5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a2feb2a5
Branch: refs/heads/TINKERPOP-1956
Commit: a2feb2a518d550091b5c2cbaf0ef32db18956f21
Parents: 58d3d40
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 15:51:57 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 15:51:57 2018 -0400
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a2feb2a5/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 96cfe6a..6c98950 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,5 +29,6 @@ jobs:
include:
- script: "mvn clean install -Dci --batch-mode -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
- script: "touch gremlin-dotnet/src/.glv && touch gremlin-dotnet/test/.glv && mvn clean install -q -DskipTests && mvn verify -pl :gremlin-dotnet,:gremlin-dotnet-tests -P gremlin-dotnet -DskipIntegrationTests=false"
+ - script: "touch gremlin-python/.glv && mvn clean install -q -DskipTests && mvn verify -pl gremlin-python -DskipIntegrationTests=false"
- script: "mvn clean install -q -DskipTests && mvn verify -pl :gremlin-javascript -DskipIntegrationTests=false"
- script: "mvn clean install -q -DskipTests && mvn verify -pl :spark-gremlin -DskipIntegrationTests=false"
[06/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c7ece36e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c7ece36e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c7ece36e
Branch: refs/heads/TINKERPOP-1956
Commit: c7ece36ec4b9678f8d7372bf6ac3f3d68e6072a6
Parents: 8275e45 e9ab93a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed May 2 09:39:13 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed May 2 09:39:13 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[30/50] [abbrv] tinkerpop git commit: TINKERPOP-1447 Added automatic
tab generation for code snippets in asciidoc files.
Posted by sp...@apache.org.
TINKERPOP-1447 Added automatic tab generation for code snippets in asciidoc files.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/906f2441
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/906f2441
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/906f2441
Branch: refs/heads/TINKERPOP-1956
Commit: 906f244159537ae85cbc7afc099e2fd401961292
Parents: eb79f39
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Dec 15 14:30:59 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri May 11 18:10:35 2018 -0700
----------------------------------------------------------------------
docs/preprocessor/awk/tabify.awk | 120 +++++
docs/preprocessor/preprocess-file.sh | 4 +-
docs/sass/compile | 29 ++
docs/sass/tabs.scss | 178 ++++++++
docs/src/dev/provider/index.asciidoc | 4 +-
docs/src/recipes/index.asciidoc | 4 +-
docs/src/reference/the-graph.asciidoc | 82 ++++
docs/stylesheets/tinkerpop-base.css | 694 +++++++++++++++++++++++++++++
docs/stylesheets/tinkerpop.css | 1 +
9 files changed, 1111 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/preprocessor/awk/tabify.awk
----------------------------------------------------------------------
diff --git a/docs/preprocessor/awk/tabify.awk b/docs/preprocessor/awk/tabify.awk
new file mode 100644
index 0000000..24d42a6
--- /dev/null
+++ b/docs/preprocessor/awk/tabify.awk
@@ -0,0 +1,120 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+#
+# @author Daniel Kuppitz (http://gremlin.guru)
+#
+function print_tabs(next_id, tabs, blocks) {
+
+ num_tabs = length(tabs)
+ x = next_id
+
+ print "++++"
+ print "<section class=\"tabs tabs-" num_tabs "\">"
+
+ for (i in tabs) {
+ title = tabs[i]
+ print " <input id=\"tab-" id_part "-" x "\" type=\"radio\" name=\"radio-set-" id_part "-" next_id "\" class=\"tab-selector-" i "\"" (i == 1 ? " checked=\"checked\"" : "") " />"
+ print " <label for=\"tab-" id_part "-" x "\" class=\"tab-label-" i "\">" title "</label>"
+ x++
+ }
+
+ for (i in blocks) {
+ print " <div class=\"tabcontent\">"
+ print " <div class=\"tabcontent-" i "\">"
+ print "++++\n"
+ print blocks[i]
+ print "++++"
+ print " </div>"
+ print " </div>"
+ }
+
+ print "</section>"
+ print "++++\n"
+}
+
+function transform_callouts(code, c) {
+ return gensub(/\s*((<[0-9]+>\s*)*<[0-9]+>)\s*\n/, " " c c " \\1\\2\n", "g", code)
+}
+
+BEGIN {
+ id_part=systime()
+ status = 0
+ next_id = 1
+ block[0] = 0 # initialize "blocks" as an array
+ delete blocks[0]
+}
+
+/^\[gremlin-/ {
+ status = 1
+ lang = gensub(/^\[gremlin-([^,\]]+).*/, "\\1", "g", $0)
+ code = ""
+}
+
+/^\[source,(csharp|groovy|java|python)/ {
+ if (status == 3) {
+ status = 1
+ lang = gensub(/^\[source,([^\]]+).*/, "\\1", "g", $0)
+ code = ""
+ }
+}
+
+! /^\[source,(csharp|groovy|java|python)/ {
+ if (status == 3 && $0 != "") {
+ print_tabs(next_id, tabs, blocks)
+ next_id = next_id + length(tabs)
+ for (i in tabs) {
+ delete tabs[i]
+ delete blocks[i]
+ }
+ status = 0
+ }
+}
+
+/^----$/ {
+ if (status == 1) {
+ status = 2
+ } else if (status == 2) {
+ status = 3
+ }
+}
+
+{ if (status == 3) {
+ if ($0 == "----") {
+ i = length(blocks) + 1
+ if (i == 1) {
+ tabs[i] = "console (" lang ")"
+ blocks[i] = code_header code "\n" $0 "\n"
+ i++
+ }
+ tabs[i] = lang
+ switch (lang) {
+ case "python":
+ c = "#"
+ break
+ default:
+ c = "//"
+ break
+ }
+ blocks[i] = "[source," lang "]" transform_callouts(code, c) "\n" $0 "\n"
+ }
+ } else {
+ if (status == 0) print
+ else if (status == 1) code_header = $0
+ else code = code "\n" $0
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/preprocessor/preprocess-file.sh
----------------------------------------------------------------------
diff --git a/docs/preprocessor/preprocess-file.sh b/docs/preprocessor/preprocess-file.sh
index d5076f1..7d3956d 100755
--- a/docs/preprocessor/preprocess-file.sh
+++ b/docs/preprocessor/preprocess-file.sh
@@ -132,6 +132,7 @@ if [ ! ${SKIP} ] && [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
fi
sed 's/\t/ /g' ${input} |
+ awk -f ${AWK_SCRIPTS}/tabify.awk |
awk -f ${AWK_SCRIPTS}/prepare.awk |
awk -f ${AWK_SCRIPTS}/init-code-blocks.awk -v TP_HOME="${TP_HOME}" -v PYTHONPATH="${TP_HOME}/gremlin-python/target/classes/Lib" |
awk -f ${AWK_SCRIPTS}/progressbar.awk -v tpl=${AWK_SCRIPTS}/progressbar.groovy.template |
@@ -141,8 +142,9 @@ if [ ! ${SKIP} ] && [ $(grep -c '^\[gremlin' ${input}) -gt 0 ]; then
${lb} awk -f ${AWK_SCRIPTS}/cleanup.awk |
${lb} awk -f ${AWK_SCRIPTS}/language-variants.awk > ${output}
+ # check exit code for each of the previously piped commands
ps=(${PIPESTATUS[@]})
- for i in {0..6}; do
+ for i in {0..9}; do
ec=${ps[i]}
[ ${ec} -eq 0 ] || break
done
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/sass/compile
----------------------------------------------------------------------
diff --git a/docs/sass/compile b/docs/sass/compile
new file mode 100755
index 0000000..0e0d8e3
--- /dev/null
+++ b/docs/sass/compile
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+DIR=`dirname $0`
+
+IF="${DIR}/tabs.scss"
+OF="${DIR}/../stylesheets/tabs.css"
+
+scss --sourcemap=none -t compressed -C ${IF} ${OF}
+cat ${DIR}/../stylesheets/tinkerpop-base.css ${OF} > ${DIR}/../stylesheets/tinkerpop.css
+rm ${OF}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/sass/tabs.scss
----------------------------------------------------------------------
diff --git a/docs/sass/tabs.scss b/docs/sass/tabs.scss
new file mode 100644
index 0000000..39c88f4
--- /dev/null
+++ b/docs/sass/tabs.scss
@@ -0,0 +1,178 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+$blue: #3f6b9d;
+$orange: #e08f24;
+$white: #fefefe;
+$black: #1a1a1a;
+$gray: #eee;
+
+$active: #609060;
+$inactive: #e9ffe9;
+
+$tabHeight: 50px;
+$minTabs: 2;
+$maxTabs: 4;
+
+@mixin single-transition($property:all, $speed:150ms, $ease:ease, $delay: 0s) {
+ -webkit-transition: $property $speed $ease $delay;
+ transition: $property $speed $ease $delay;
+}
+
+.tabs {
+
+ position: relative;
+ margin: 40px auto;
+ width: 1024px;
+ max-width: 100%;
+ overflow: hidden;
+ padding-top: 10px;
+ margin-bottom: 60px;
+
+ input {
+ position: absolute;
+ z-index: 1000;
+ height: $tabHeight;
+ left: 0;
+ top: 0;
+ opacity: 0;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+ filter: alpha(opacity=0);
+ cursor: pointer;
+ margin: 0;
+ &:hover + label {
+ background: $orange;
+ }
+ }
+
+ label {
+ background: $inactive;
+ color: $black;
+ font-size: 15px;
+ line-height: $tabHeight;
+ height: $tabHeight + 10;
+ position: relative;
+ top: 0;
+ padding: 0 20px;
+ float: left;
+ display: block;
+ letter-spacing: 1px;
+ text-transform: uppercase;
+ font-weight: bold;
+ text-align: center;
+ box-shadow: 2px 0 2px rgba(0,0,0,0.1), -2px 0 2px rgba(0,0,0,0.1);
+ box-sizing: border-box;
+ @include single-transition();
+ &:hover{
+ cursor: pointer;
+ }
+ &:after {
+ content: '';
+ background: $active;
+ position: absolute;
+ bottom: -2px;
+ left: 0;
+ width: 100%;
+ height: 2px;
+ display: block;
+ }
+ }
+}
+
+@for $n from $minTabs through $maxTabs {
+
+ .tabs-#{$n} {
+
+ input {
+ width: 100% / $n;
+ @for $i from 1 through $n {
+ &.tab-selector-#{$i}{
+ left: ($i - 1) * (100% / $n);
+ }
+ }
+ }
+
+ label {
+ width: 100% / $n;
+ }
+ }
+}
+
+.tabs label:first-of-type {
+ z-index: 4;
+}
+.tab-label-2 {
+ z-index: 4;
+}
+.tab-label-3 {
+ z-index: 3;
+}
+.tab-label-4 {
+ z-index: 2;
+}
+
+.tabs input:checked + label {
+ background: $active;
+ color: $white;
+ z-index: 6;
+}
+
+.clear-shadow {
+ clear: both;
+}
+
+.tabcontent {
+ height: auto;
+ width: 100%;
+ float: left;
+ position: relative;
+ z-index: 5;
+ background: $gray;
+ top: -10px;
+ box-sizing: border-box;
+ &>div{
+ position: relative;
+ float: left;
+ width: 0;
+ height: 0;
+ box-sizing: border-box;
+ top: 0;
+ left: 0;
+ z-index: 1;
+ opacity: 0;
+ background: $gray;
+ }
+ .CodeRay {
+ background-color: $white;
+ }
+}
+
+@for $i from 1 through $maxTabs {
+ .tabs .tab-selector-#{$i}:checked ~ .tabcontent .tabcontent-#{$i} {
+ z-index: 100;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+ filter: alpha(opacity=100);
+ opacity: 1;
+ width: 100%;
+ height: auto;
+ width: 100%;
+ height: auto;
+ padding-top: 30px;
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/src/dev/provider/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/provider/index.asciidoc b/docs/src/dev/provider/index.asciidoc
index ce4e9f4..5e73622 100644
--- a/docs/src/dev/provider/index.asciidoc
+++ b/docs/src/dev/provider/index.asciidoc
@@ -611,7 +611,7 @@ features it implements) or should not otherwise be executed. It is possible for
by using the `@Graph.OptOut` annotation. The following is an example of this annotation usage as taken from
`HadoopGraph`:
-[source, java]
+[source,java]
----
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_STANDARD)
@Graph.OptIn(Graph.OptIn.SUITE_PROCESS_COMPUTER)
@@ -648,7 +648,7 @@ Also note that some of the tests in the Gremlin Test Suite are parameterized tes
specificity to be properly ignored. To ignore these types of tests, examine the name template of the parameterized
tests. It is defined by a Java annotation that looks like this:
-[source, java]
+[source,java]
@Parameterized.Parameters(name = "expect({0})")
The annotation above shows that the name of each parameterized test will be prefixed with "expect" and have
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/src/recipes/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/index.asciidoc b/docs/src/recipes/index.asciidoc
index c59cc89..3fdee22 100644
--- a/docs/src/recipes/index.asciidoc
+++ b/docs/src/recipes/index.asciidoc
@@ -90,12 +90,12 @@ prior to submitting a recipe.
To contribute a recipe, first clone the repository:
-[source, shell]
+[source,shell]
git clone https://github.com/apache/tinkerpop.git
The recipes can be found in this directory:
-[source, shell]
+[source,shell]
ls docs/src/recipes
Each recipe exists within a separate `.asciidoc` file. The file name should match the name of the recipe. Recipe names
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graph.asciidoc b/docs/src/reference/the-graph.asciidoc
index a3b2bd3..791c342 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -602,6 +602,88 @@ IMPORTANT: When using the extended type system in Gremlin Server, support for th
Gremlin Language Variants is dependent on the programming language, the driver and its serializers. These
implementations are only required to support the core types and not the extended ones.
+Here's the same previous example of GraphSON 1.0, but with GraphSON 2.0:
+
+[gremlin-groovy]
+----
+graph = TinkerFactory.createModern()
+g = graph.traversal()
+f = new ByteArrayOutputStream()
+mapper = graph.io(graphson()).mapper().version(GraphSONVersion.V2_0).create()
+graph.io(graphson()).writer().mapper(mapper).create().writeVertex(f, g.V(1).next(), BOTH)
+f.close()
+----
+
+Creating a GraphSON 2.0 mapper is done by calling `.version(GraphSONVersion.V2_0)` on the mapper builder. Here's is the
+example output from the code above:
+
+[source,json]
+----
+{
+ "@type": "g:Vertex",
+ "@value": {
+ "id": {
+ "@type": "g:Int32",
+ "@value": 1
+ },
+ "label": "person",
+ "properties": {
+ "name": [{
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 0
+ },
+ "value": "marko",
+ "label": "name"
+ }
+ }],
+ "uuid": [{
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 12
+ },
+ "value": {
+ "@type": "g:UUID",
+ "@value": "829c7ddb-3831-4687-a872-e25201230cd3"
+ },
+ "label": "uuid"
+ }
+ }],
+ "age": [{
+ "@type": "g:VertexProperty",
+ "@value": {
+ "id": {
+ "@type": "g:Int64",
+ "@value": 1
+ },
+ "value": {
+ "@type": "g:Int32",
+ "@value": 29
+ },
+ "label": "age"
+ }
+ }]
+ }
+ }
+}
+----
+
+Types can be disabled when creating a GraphSON 2.0 `Mapper` with:
+
+[source,groovy]
+----
+graph.io(graphson()).mapper().
+ version(GraphSONVersion.V2_0).
+ typeInfo(GraphSONMapper.TypeInfo.NO_TYPES).create()
+----
+
+By disabling types, the JSON payload produced will lack the extra information that is written for types. Please note,
+disabling types can be unsafe with regards to the written data in that types can be lost.
+
[[gryo-reader-writer]]
=== Gryo Reader/Writer
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/stylesheets/tinkerpop-base.css
----------------------------------------------------------------------
diff --git a/docs/stylesheets/tinkerpop-base.css b/docs/stylesheets/tinkerpop-base.css
new file mode 100644
index 0000000..89b6814
--- /dev/null
+++ b/docs/stylesheets/tinkerpop-base.css
@@ -0,0 +1,694 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*! normalize.css v2.1.2 | MIT License | git.io/normalize */
+/* ========================================================================== HTML5 display definitions ========================================================================== */
+/** Correct `block` display not defined in IE 8/9. */
+@import url(http://cdnjs.cloudflare.com/ajax/libs/font-awesome/3.2.1/css/font-awesome.css);
+article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary { display: block; }
+
+/** Correct `inline-block` display not defined in IE 8/9. */
+audio, canvas, video { display: inline-block; }
+
+/** Prevent modern browsers from displaying `audio` without controls. Remove excess height in iOS 5 devices. */
+audio:not([controls]) { display: none; height: 0; }
+
+/** Address `[hidden]` styling not present in IE 8/9. Hide the `template` element in IE, Safari, and Firefox < 22. */
+[hidden], template { display: none; }
+
+script { display: none !important; }
+
+/* ========================================================================== Base ========================================================================== */
+/** 1. Set default font family to sans-serif. 2. Prevent iOS text size adjust after orientation change, without disabling user zoom. */
+html { font-family: sans-serif; /* 1 */ -ms-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */ }
+
+/** Remove default margin. */
+body { margin: 0; }
+
+/* ========================================================================== Links ========================================================================== */
+/** Remove the gray background color from active links in IE 10. */
+a { background: transparent; }
+
+/** Address `outline` inconsistency between Chrome and other browsers. */
+a:focus { outline: thin dotted; }
+
+/** Improve readability when focused and also mouse hovered in all browsers. */
+a:active, a:hover { outline: 0; }
+
+/* ========================================================================== Typography ========================================================================== */
+/** Address variable `h1` font-size and margin within `section` and `article` contexts in Firefox 4+, Safari 5, and Chrome. */
+h1 { font-size: 2em; margin: 0.67em 0; }
+
+/** Address styling not present in IE 8/9, Safari 5, and Chrome. */
+abbr[title] { border-bottom: 1px dotted; }
+
+/** Address style set to `bolder` in Firefox 4+, Safari 5, and Chrome. */
+b, strong { font-weight: bold; }
+
+/** Address styling not present in Safari 5 and Chrome. */
+dfn { font-style: italic; }
+
+/** Address differences between Firefox and other browsers. */
+hr { -moz-box-sizing: content-box; box-sizing: content-box; height: 0; }
+
+/** Address styling not present in IE 8/9. */
+mark { background: #ff0; color: #000; }
+
+/** Correct font family set oddly in Safari 5 and Chrome. */
+code, kbd, pre, samp { font-family: monospace, serif; font-size: 1em; }
+
+/** Improve readability of pre-formatted text in all browsers. */
+pre { white-space: pre-wrap; }
+
+/** Set consistent quote types. */
+q { quotes: "\201C" "\201D" "\2018" "\2019"; }
+
+/** Address inconsistent and variable font size in all browsers. */
+small { font-size: 80%; }
+
+/** Prevent `sub` and `sup` affecting `line-height` in all browsers. */
+sub, sup { font-size: 75%; line-height: 0; position: relative; vertical-align: baseline; }
+
+sup { top: -0.5em; }
+
+sub { bottom: -0.25em; }
+
+/* ========================================================================== Embedded content ========================================================================== */
+/** Remove border when inside `a` element in IE 8/9. */
+img { border: 0; }
+
+/** Correct overflow displayed oddly in IE 9. */
+svg:not(:root) { overflow: hidden; }
+
+/* ========================================================================== Figures ========================================================================== */
+/** Address margin not present in IE 8/9 and Safari 5. */
+figure { margin: 0; }
+
+/* ========================================================================== Forms ========================================================================== */
+/** Define consistent border, margin, and padding. */
+fieldset { border: 1px solid #c0c0c0; margin: 0 2px; padding: 0.35em 0.625em 0.75em; }
+
+/** 1. Correct `color` not being inherited in IE 8/9. 2. Remove padding so people aren't caught out if they zero out fieldsets. */
+legend { border: 0; /* 1 */ padding: 0; /* 2 */ }
+
+/** 1. Correct font family not being inherited in all browsers. 2. Correct font size not being inherited in all browsers. 3. Address margins set differently in Firefox 4+, Safari 5, and Chrome. */
+button, input, select, textarea { font-family: inherit; /* 1 */ font-size: 100%; /* 2 */ margin: 0; /* 3 */ }
+
+/** Address Firefox 4+ setting `line-height` on `input` using `!important` in the UA stylesheet. */
+button, input { line-height: normal; }
+
+/** Address inconsistent `text-transform` inheritance for `button` and `select`. All other form control elements do not inherit `text-transform` values. Correct `button` style inheritance in Chrome, Safari 5+, and IE 8+. Correct `select` style inheritance in Firefox 4+ and Opera. */
+button, select { text-transform: none; }
+
+/** 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls. 2. Correct inability to style clickable `input` types in iOS. 3. Improve usability and consistency of cursor style between image-type `input` and others. */
+button, html input[type="button"], input[type="reset"], input[type="submit"] { -webkit-appearance: button; /* 2 */ cursor: pointer; /* 3 */ }
+
+/** Re-set default cursor for disabled elements. */
+button[disabled], html input[disabled] { cursor: default; }
+
+/** 1. Address box sizing set to `content-box` in IE 8/9. 2. Remove excess padding in IE 8/9. */
+input[type="checkbox"], input[type="radio"] { box-sizing: border-box; /* 1 */ padding: 0; /* 2 */ }
+
+/** 1. Address `appearance` set to `searchfield` in Safari 5 and Chrome. 2. Address `box-sizing` set to `border-box` in Safari 5 and Chrome (include `-moz` to future-proof). */
+input[type="search"] { -webkit-appearance: textfield; /* 1 */ -moz-box-sizing: content-box; -webkit-box-sizing: content-box; /* 2 */ box-sizing: content-box; }
+
+/** Remove inner padding and search cancel button in Safari 5 and Chrome on OS X. */
+input[type="search"]::-webkit-search-cancel-button, input[type="search"]::-webkit-search-decoration { -webkit-appearance: none; }
+
+/** Remove inner padding and border in Firefox 4+. */
+button::-moz-focus-inner, input::-moz-focus-inner { border: 0; padding: 0; }
+
+/** 1. Remove default vertical scrollbar in IE 8/9. 2. Improve readability and alignment in all browsers. */
+textarea { overflow: auto; /* 1 */ vertical-align: top; /* 2 */ }
+
+/* ========================================================================== Tables ========================================================================== */
+/** Remove most spacing between table cells. */
+table { border-collapse: collapse; border-spacing: 0; }
+
+meta.foundation-mq-small { font-family: "only screen and (min-width: 768px)"; width: 768px; }
+
+meta.foundation-mq-medium { font-family: "only screen and (min-width:1280px)"; width: 1280px; }
+
+meta.foundation-mq-large { font-family: "only screen and (min-width:1440px)"; width: 1440px; }
+
+*, *:before, *:after { -moz-box-sizing: border-box; -webkit-box-sizing: border-box; box-sizing: border-box; }
+
+html, body { font-size: 100%; }
+
+body { background: white; color: #222222; padding: 0; margin: 0; font-family: "Helvetica Neue", "Helvetica", Helvetica, Arial, sans-serif; font-weight: normal; font-style: normal; line-height: 1; position: relative; cursor: auto; }
+
+a:hover { cursor: pointer; }
+
+img, object, embed { max-width: 100%; height: auto; }
+
+object, embed { height: 100%; }
+
+img { -ms-interpolation-mode: bicubic; }
+
+#map_canvas img, #map_canvas embed, #map_canvas object, .map_canvas img, .map_canvas embed, .map_canvas object { max-width: none !important; }
+
+.left { float: left !important; }
+
+.right { float: right !important; }
+
+.text-left { text-align: left !important; }
+
+.text-right { text-align: right !important; }
+
+.text-center { text-align: center !important; }
+
+.text-justify { text-align: justify !important; }
+
+.hide { display: none; }
+
+.antialiased, body { -webkit-font-smoothing: antialiased; }
+
+img { display: inline-block; vertical-align: middle; }
+
+textarea { height: auto; min-height: 50px; }
+
+select { width: 100%; }
+
+p.lead, .paragraph.lead > p, #preamble > .sectionbody > .paragraph:first-of-type p { font-size: 1.21875em; line-height: 1.6; }
+
+.subheader, #content #toctitle, .admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .listingblock > .title, .literalblock > .title, .mathblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .videoblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title, .tableblock > caption { line-height: 1.4; color: #6c818f; font-weight: 300; margin-top: 0.2em; margin-bottom: 0.5em; }
+
+/* Typography resets */
+div, dl, dt, dd, ul, ol, li, h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6, pre, form, p, blockquote, th, td { margin: 0; padding: 0; direction: ltr; }
+
+/* Default Link Styles */
+a { color: #444444; text-decoration: underline; line-height: inherit; }
+a:hover, a:focus { color: #111111; }
+a img { border: none; }
+
+/* Default paragraph styles */
+p { font-family: inherit; font-weight: normal; font-size: 1em; line-height: 1.5; margin-bottom: 1.25em; text-rendering: optimizeLegibility; }
+p aside { font-size: 0.875em; line-height: 1.35; font-style: italic; }
+
+/* Default header styles */
+h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6 { font-family: ff-meta-web-pro-1, ff-meta-web-pro-2, Arial, "Helvetica Neue", sans-serif; font-weight: bold; font-style: normal; color: #465158; text-rendering: optimizeLegibility; margin-top: 1em; margin-bottom: 0.5em; line-height: 1.2125em; }
+h1 small, h2 small, h3 small, #toctitle small, .sidebarblock > .content > .title small, h4 small, h5 small, h6 small { font-size: 60%; color: #909ea7; line-height: 0; }
+
+h1 { font-size: 2.125em; }
+
+h2 { font-size: 1.6875em; }
+
+h3, #toctitle, .sidebarblock > .content > .title { font-size: 1.375em; }
+
+h4 { font-size: 1.125em; }
+
+h5 { font-size: 1.125em; }
+
+h6 { font-size: 1em; }
+
+hr { border: solid #dddddd; border-width: 1px 0 0; clear: both; margin: 1.25em 0 1.1875em; height: 0; }
+
+/* Helpful Typography Defaults */
+em, i { font-style: italic; line-height: inherit; }
+
+strong, b { font-weight: bold; line-height: inherit; }
+
+small { font-size: 60%; line-height: inherit; }
+
+code { font-family: "Consolas", "Deja Vu Sans Mono", "Bitstream Vera Sans Mono", monospace; font-weight: normal; color: #444444; }
+
+/* Lists */
+ul, ol, dl { font-size: 1em; line-height: 1.5; margin-bottom: 1.25em; list-style-position: outside; font-family: inherit; }
+
+ul, ol { margin-left: 0; }
+ul.no-bullet, ol.no-bullet { margin-left: 0; }
+
+/* Unordered Lists */
+ul li ul, ul li ol { margin-left: 1.25em; margin-bottom: 0; font-size: 1em; /* Override nested font-size change */ }
+ul.square li ul, ul.circle li ul, ul.disc li ul { list-style: inherit; }
+ul.square { list-style-type: square; }
+ul.circle { list-style-type: circle; }
+ul.disc { list-style-type: disc; }
+ul.no-bullet { list-style: none; }
+
+/* Ordered Lists */
+ol li ul, ol li ol { margin-left: 1.25em; margin-bottom: 0; }
+
+/* Definition Lists */
+dl dt { margin-bottom: 0.3em; font-weight: bold; }
+dl dd { margin-bottom: 0.75em; }
+
+/* Abbreviations */
+abbr, acronym { text-transform: uppercase; font-size: 90%; color: black; border-bottom: 1px dotted #dddddd; cursor: help; }
+
+abbr { text-transform: none; }
+
+/* Blockquotes */
+blockquote { margin: 0 0 1.25em; padding: 0.5625em 1.25em 0 1.1875em; border-left: 1px solid #dddddd; }
+blockquote cite { display: block; font-size: 0.8125em; color: #748590; }
+blockquote cite:before { content: "\2014 \0020"; }
+blockquote cite a, blockquote cite a:visited { color: #748590; }
+
+blockquote, blockquote p { line-height: 1.5; color: #909ea7; }
+
+/* Microformats */
+.vcard { display: inline-block; margin: 0 0 1.25em 0; border: 1px solid #dddddd; padding: 0.625em 0.75em; }
+.vcard li { margin: 0; display: block; }
+.vcard .fn { font-weight: bold; font-size: 0.9375em; }
+
+.vevent .summary { font-weight: bold; }
+.vevent abbr { cursor: auto; text-decoration: none; font-weight: bold; border: none; padding: 0 0.0625em; }
+
+@media only screen and (min-width: 768px) { h1, h2, h3, #toctitle, .sidebarblock > .content > .title, h4, h5, h6 { line-height: 1.4; }
+ h1 { font-size: 2.75em; }
+ h2 { font-size: 2.3125em; }
+ h3, #toctitle, .sidebarblock > .content > .title { font-size: 1.6875em; }
+ h4 { font-size: 1.4375em; } }
+/* Print styles. Inlined to avoid required HTTP connection: www.phpied.com/delay-loading-your-print-css/ Credit to Paul Irish and HTML5 Boilerplate (html5boilerplate.com)
+*/
+.print-only { display: none !important; }
+
+@media print { * { background: transparent !important; color: #000 !important; /* Black prints faster: h5bp.com/s */ box-shadow: none !important; text-shadow: none !important; }
+ a, a:visited { text-decoration: underline; }
+ a[href]:after { content: " (" attr(href) ")"; }
+ abbr[title]:after { content: " (" attr(title) ")"; }
+ .ir a:after, a[href^="javascript:"]:after, a[href^="#"]:after { content: ""; }
+ pre, blockquote { border: 1px solid #999; page-break-inside: avoid; }
+ thead { display: table-header-group; /* h5bp.com/t */ }
+ tr, img { page-break-inside: avoid; }
+ img { max-width: 100% !important; }
+ @page { margin: 0.5cm; }
+ p, h2, h3, #toctitle, .sidebarblock > .content > .title { orphans: 3; widows: 3; }
+ h2, h3, #toctitle, .sidebarblock > .content > .title { page-break-after: avoid; }
+ .hide-on-print { display: none !important; }
+ .print-only { display: block !important; }
+ .hide-for-print { display: none !important; }
+ .show-for-print { display: inherit !important; } }
+/* Tables */
+table { background: white; margin-bottom: 1.25em; border: solid 0 #dddddd; }
+table thead, table tfoot { background: none; font-weight: bold; }
+table thead tr th, table thead tr td, table tfoot tr th, table tfoot tr td { padding: 1px 8px 1px 5px; font-size: 1em; color: #222222; text-align: left; }
+table tr th, table tr td { padding: 1px 8px 1px 5px; font-size: 1em; color: #222222; }
+table tr.even, table tr.alt, table tr:nth-of-type(even) { background: none; }
+table thead tr th, table tfoot tr th, table tbody tr td, table tr td, table tfoot tr td { display: table-cell; line-height: 1.5; }
+
+.clearfix:before, .clearfix:after, .float-group:before, .float-group:after { content: " "; display: table; }
+.clearfix:after, .float-group:after { clear: both; }
+
+*:not(pre) > code { font-size: 0.95em; padding: 0; white-space: nowrap; background-color: #f2f2f2; border: 0 solid #dddddd; -webkit-border-radius: 6px; border-radius: 6px; text-shadow: none; }
+
+pre, pre > code { line-height: 1.2; color: inherit; font-family: "Consolas", "Deja Vu Sans Mono", "Bitstream Vera Sans Mono", monospace; font-weight: normal; }
+
+.keyseq { color: #333333; }
+
+kbd:not(.keyseq) { display: inline-block; color: black; font-size: 0.75em; line-height: 1.4; background-color: #F7F7F7; border: 1px solid #ccc; -webkit-border-radius: 3px; border-radius: 3px; -webkit-box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), 0 0 0 2px white inset; margin: -0.15em 0.15em 0 0.15em; padding: 0.2em 0.6em 0.2em 0.5em; vertical-align: middle; white-space: nowrap; }
+
+.keyseq kbd:first-child { margin-left: 0; }
+
+.keyseq kbd:last-child { margin-right: 0; }
+
+.menuseq, .menu { color: black; }
+
+b.button:before, b.button:after { position: relative; top: -1px; font-weight: normal; }
+
+b.button:before { content: "["; padding: 0 3px 0 2px; }
+
+b.button:after { content: "]"; padding: 0 2px 0 3px; }
+
+p a > code:hover { color: #373737; }
+
+#header, #content, #footnotes, #footer { width: 100%; margin-left: auto; margin-right: auto; margin-top: 0; margin-bottom: 0; max-width: 62.5em; *zoom: 1; position: relative; padding-left: 0.9375em; padding-right: 0.9375em; }
+#header:before, #header:after, #content:before, #content:after, #footnotes:before, #footnotes:after, #footer:before, #footer:after { content: " "; display: table; }
+#header:after, #content:after, #footnotes:after, #footer:after { clear: both; }
+
+#header { margin-bottom: 2.5em; }
+#header > h1 { color: #111111; font-weight: bold; border-bottom: 1px solid #dddddd; margin-bottom: -28px; padding-bottom: 32px; }
+#header span { color: #909ea7; }
+#header #revnumber { text-transform: capitalize; }
+#header br { display: none; }
+#header br + span { padding-left: 3px; }
+#header br + span:before { content: "\2013 \0020"; }
+#header br + span.author { padding-left: 0; }
+#header br + span.author:before { content: ", "; }
+
+#toc { border-bottom: 1px solid #dddddd; padding-bottom: 1.25em; }
+#toc > ul { margin-left: 0.25em; }
+#toc ul.sectlevel0 > li > a { font-style: italic; }
+#toc ul.sectlevel0 ul.sectlevel1 { margin-left: 0; margin-top: 0.5em; margin-bottom: 0.5em; }
+#toc ul { list-style-type: none; }
+
+#toctitle { color: #6c818f; }
+
+@media only screen and (min-width: 768px) { body.toc2 { padding-left: 15em; padding-right: 0; }
+ #toc.toc2 { position: fixed; width: 15em; left: 0; top: 0; border-right: 1px solid #dddddd; border-bottom: 0; z-index: 1000; padding: 1em; height: 100%; overflow: auto; }
+ #toc.toc2 #toctitle { margin-top: 0; font-size: 1.2em; }
+ #toc.toc2 > ul { font-size: .90em; }
+ #toc.toc2 ul ul { margin-left: 0; padding-left: 1em; }
+ #toc.toc2 ul.sectlevel0 ul.sectlevel1 { padding-left: 0; margin-top: 0.5em; margin-bottom: 0.5em; }
+ body.toc2.toc-right { padding-left: 0; padding-right: 15em; }
+ body.toc2.toc-right #toc.toc2 { border-right: 0; border-left: 1px solid #dddddd; left: auto; right: 0; } }
+@media only screen and (min-width: 1280px) { body.toc2 { padding-left: 20em; padding-right: 0; }
+ #toc.toc2 { width: 20em; }
+ #toc.toc2 #toctitle { font-size: 1.375em; }
+ #toc.toc2 > ul { font-size: 0.95em; }
+ #toc.toc2 ul ul { padding-left: 1.25em; }
+ body.toc2.toc-right { padding-left: 0; padding-right: 20em; } }
+#content #toc { border-style: solid; border-width: 1px; border-color: #d9d9d9; margin-bottom: 1.25em; padding: 1.25em; background: #f2f2f2; border-width: 0; -webkit-border-radius: 6px; border-radius: 6px; }
+#content #toc > :first-child { margin-top: 0; }
+#content #toc > :last-child { margin-bottom: 0; }
+#content #toc a { text-decoration: none; }
+
+#content #toctitle { font-weight: bold; font-family: ff-meta-web-pro-1, ff-meta-web-pro-2, Arial, "Helvetica Neue", sans-serif; font-size: 1em; padding-left: 0.125em; }
+
+#footer { max-width: 100%; background-color: black; padding: 1.25em; }
+
+#footer-text { color: white; line-height: 1.35; }
+
+.sect1 { padding-bottom: 1.25em; }
+
+.sect1 + .sect1 { border-top: 1px solid #dddddd; }
+
+#content h1 > a.anchor, h2 > a.anchor, h3 > a.anchor, #toctitle > a.anchor, .sidebarblock > .content > .title > a.anchor, h4 > a.anchor, h5 > a.anchor, h6 > a.anchor { position: absolute; width: 1em; margin-left: -1em; display: block; text-decoration: none; visibility: hidden; text-align: center; font-weight: normal; }
+#content h1 > a.anchor:before, h2 > a.anchor:before, h3 > a.anchor:before, #toctitle > a.anchor:before, .sidebarblock > .content > .title > a.anchor:before, h4 > a.anchor:before, h5 > a.anchor:before, h6 > a.anchor:before { content: '\00A7'; font-size: .85em; vertical-align: text-top; display: block; margin-top: 0.05em; }
+#content h1:hover > a.anchor, #content h1 > a.anchor:hover, h2:hover > a.anchor, h2 > a.anchor:hover, h3:hover > a.anchor, #toctitle:hover > a.anchor, .sidebarblock > .content > .title:hover > a.anchor, h3 > a.anchor:hover, #toctitle > a.anchor:hover, .sidebarblock > .content > .title > a.anchor:hover, h4:hover > a.anchor, h4 > a.anchor:hover, h5:hover > a.anchor, h5 > a.anchor:hover, h6:hover > a.anchor, h6 > a.anchor:hover { visibility: visible; }
+#content h1 > a.link, h2 > a.link, h3 > a.link, #toctitle > a.link, .sidebarblock > .content > .title > a.link, h4 > a.link, h5 > a.link, h6 > a.link { color: #465158; text-decoration: none; }
+#content h1 > a.link:hover, h2 > a.link:hover, h3 > a.link:hover, #toctitle > a.link:hover, .sidebarblock > .content > .title > a.link:hover, h4 > a.link:hover, h5 > a.link:hover, h6 > a.link:hover { color: #3b444a; }
+
+.imageblock, .literalblock, .listingblock, .mathblock, .verseblock, .videoblock { margin-bottom: 1.25em; }
+
+.admonitionblock td.content > .title, .exampleblock > .title, .imageblock > .title, .listingblock > .title, .literalblock > .title, .mathblock > .title, .openblock > .title, .paragraph > .title, .quoteblock > .title, .sidebarblock > .title, .tableblock > .title, .verseblock > .title, .videoblock > .title, .dlist > .title, .olist > .title, .ulist > .title, .qlist > .title, .hdlist > .title { text-align: left; font-weight: bold; }
+
+.tableblock > caption { text-align: left; font-weight: bold; white-space: nowrap; overflow: visible; max-width: 0; }
+
+table.tableblock #preamble > .sectionbody > .paragraph:first-of-type p { font-size: inherit; }
+
+.admonitionblock > table { border: 0; background: none; width: 100%; }
+.admonitionblock > table td.icon { text-align: center; width: 80px; }
+.admonitionblock > table td.icon img { max-width: none; }
+.admonitionblock > table td.icon .title { font-weight: bold; text-transform: uppercase; }
+.admonitionblock > table td.content { padding-left: 1.125em; padding-right: 1.25em; border-left: 1px solid #dddddd; color: #909ea7; }
+.admonitionblock > table td.content > :last-child > :last-child { margin-bottom: 0; }
+
+.exampleblock > .content { border-style: solid; border-width: 1px; border-color: #e6e6e6; margin-bottom: 1.25em; padding: 1.25em; background: white; -webkit-border-radius: 6px; border-radius: 6px; }
+.exampleblock > .content > :first-child { margin-top: 0; }
+.exampleblock > .content > :last-child { margin-bottom: 0; }
+.exampleblock > .content h1, .exampleblock > .content h2, .exampleblock > .content h3, .exampleblock > .content #toctitle, .sidebarblock.exampleblock > .content > .title, .exampleblock > .content h4, .exampleblock > .content h5, .exampleblock > .content h6, .exampleblock > .content p { color: #333333; }
+.exampleblock > .content h1, .exampleblock > .content h2, .exampleblock > .content h3, .exampleblock > .content #toctitle, .sidebarblock.exampleblock > .content > .title, .exampleblock > .content h4, .exampleblock > .content h5, .exampleblock > .content h6 { line-height: 1; margin-bottom: 0.625em; }
+.exampleblock > .content h1.subheader, .exampleblock > .content h2.subheader, .exampleblock > .content h3.subheader, .exampleblock > .content .subheader#toctitle, .sidebarblock.exampleblock > .content > .subheader.title, .exampleblock > .content h4.subheader, .exampleblock > .content h5.subheader, .exampleblock > .content h6.subheader { line-height: 1.4; }
+
+.exampleblock.result > .content { -webkit-box-shadow: 0 1px 8px #d9d9d9; box-shadow: 0 1px 8px #d9d9d9; }
+
+.sidebarblock { border-style: solid; border-width: 1px; border-color: #d9d9d9; margin-bottom: 1.25em; padding: 1.25em; background: #f2f2f2; -webkit-border-radius: 6px; border-radius: 6px; }
+.sidebarblock > :first-child { margin-top: 0; }
+.sidebarblock > :last-child { margin-bottom: 0; }
+.sidebarblock h1, .sidebarblock h2, .sidebarblock h3, .sidebarblock #toctitle, .sidebarblock > .content > .title, .sidebarblock h4, .sidebarblock h5, .sidebarblock h6, .sidebarblock p { color: #333333; }
+.sidebarblock h1, .sidebarblock h2, .sidebarblock h3, .sidebarblock #toctitle, .sidebarblock > .content > .title, .sidebarblock h4, .sidebarblock h5, .sidebarblock h6 { line-height: 1; margin-bottom: 0.625em; }
+.sidebarblock h1.subheader, .sidebarblock h2.subheader, .sidebarblock h3.subheader, .sidebarblock .subheader#toctitle, .sidebarblock > .content > .subheader.title, .sidebarblock h4.subheader, .sidebarblock h5.subheader, .sidebarblock h6.subheader { line-height: 1.4; }
+.sidebarblock > .content > .title { color: #6c818f; margin-top: 0; line-height: 1.5; }
+
+.exampleblock > .content > :last-child > :last-child, .exampleblock > .content .olist > ol > li:last-child > :last-child, .exampleblock > .content .ulist > ul > li:last-child > :last-child, .exampleblock > .content .qlist > ol > li:last-child > :last-child, .sidebarblock > .content > :last-child > :last-child, .sidebarblock > .content .olist > ol > li:last-child > :last-child, .sidebarblock > .content .ulist > ul > li:last-child > :last-child, .sidebarblock > .content .qlist > ol > li:last-child > :last-child { margin-bottom: 0; }
+
+.literalblock pre:not([class]), .listingblock pre:not([class]) { background: #eeeeee; }
+.literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] { border-width: 1px; border-style: solid; border-color: #cccccc; -webkit-border-radius: 6px; border-radius: 6px; padding: 0.5em; word-wrap: break-word; }
+.literalblock pre.nowrap, .literalblock pre[class].nowrap, .listingblock pre.nowrap, .listingblock pre[class].nowrap { overflow-x: auto; white-space: pre; word-wrap: normal; }
+.literalblock pre > code, .literalblock pre[class] > code, .listingblock pre > code, .listingblock pre[class] > code { display: block; }
+@media only screen { .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] { font-size: 0.76em; } }
+@media only screen and (min-width: 768px) { .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] { font-size: 0.855em; } }
+@media only screen and (min-width: 1280px) { .literalblock pre, .literalblock pre[class], .listingblock pre, .listingblock pre[class] { font-size: 0.95em; } }
+
+.listingblock pre.highlight { padding: 0; }
+.listingblock pre.highlight > code { padding: 0.5em; }
+
+.listingblock > .content { position: relative; }
+
+.listingblock:hover code[class*=" language-"]:before { text-transform: uppercase; font-size: 0.9em; color: #999; position: absolute; top: 0.375em; right: 0.375em; }
+
+.listingblock:hover code.asciidoc:before { content: "asciidoc"; }
+.listingblock:hover code.clojure:before { content: "clojure"; }
+.listingblock:hover code.css:before { content: "css"; }
+.listingblock:hover code.groovy:before { content: "groovy"; }
+.listingblock:hover code.html:before { content: "html"; }
+.listingblock:hover code.java:before { content: "java"; }
+.listingblock:hover code.javascript:before { content: "javascript"; }
+.listingblock:hover code.python:before { content: "python"; }
+.listingblock:hover code.ruby:before { content: "ruby"; }
+.listingblock:hover code.sass:before { content: "sass"; }
+.listingblock:hover code.scss:before { content: "scss"; }
+.listingblock:hover code.xml:before { content: "xml"; }
+.listingblock:hover code.yaml:before { content: "yaml"; }
+
+.listingblock.terminal pre .command:before { content: attr(data-prompt); padding-right: 0.5em; color: #999; }
+
+.listingblock.terminal pre .command:not([data-prompt]):before { content: '$'; }
+
+table.pyhltable { border: 0; margin-bottom: 0; }
+
+table.pyhltable td { vertical-align: top; padding-top: 0; padding-bottom: 0; }
+
+table.pyhltable td.code { padding-left: .75em; padding-right: 0; }
+
+.highlight.pygments .lineno, table.pyhltable td:not(.code) { color: #999; padding-left: 0; padding-right: .5em; border-right: 1px solid #dddddd; }
+
+.highlight.pygments .lineno { display: inline-block; margin-right: .25em; }
+
+table.pyhltable .linenodiv { background-color: transparent !important; padding-right: 0 !important; }
+
+.quoteblock { margin: 0 0 1.25em; padding: 0.5625em 1.25em 0 1.1875em; border-left: 1px solid #dddddd; }
+.quoteblock blockquote { margin: 0 0 1.25em 0; padding: 0 0 0.5625em 0; border: 0; }
+.quoteblock blockquote > .paragraph:last-child p { margin-bottom: 0; }
+.quoteblock .attribution { margin-top: -.25em; padding-bottom: 0.5625em; font-size: 0.8125em; color: #748590; }
+.quoteblock .attribution br { display: none; }
+.quoteblock .attribution cite { display: block; margin-bottom: 0.625em; }
+
+table thead th, table tfoot th { font-weight: bold; }
+
+table.tableblock.grid-all { border-collapse: separate; border-spacing: 1px; -webkit-border-radius: 6px; border-radius: 6px; border-top: 0 solid #dddddd; border-bottom: 0 solid #dddddd; }
+
+table.tableblock.frame-topbot, table.tableblock.frame-none { border-left: 0; border-right: 0; }
+
+table.tableblock.frame-sides, table.tableblock.frame-none { border-top: 0; border-bottom: 0; }
+
+table.tableblock td .paragraph:last-child p > p:last-child, table.tableblock th > p:last-child, table.tableblock td > p:last-child { margin-bottom: 0; }
+
+th.tableblock.halign-left, td.tableblock.halign-left { text-align: left; }
+
+th.tableblock.halign-right, td.tableblock.halign-right { text-align: right; }
+
+th.tableblock.halign-center, td.tableblock.halign-center { text-align: center; }
+
+th.tableblock.valign-top, td.tableblock.valign-top { vertical-align: top; }
+
+th.tableblock.valign-bottom, td.tableblock.valign-bottom { vertical-align: bottom; }
+
+th.tableblock.valign-middle, td.tableblock.valign-middle { vertical-align: middle; }
+
+tbody tr th { display: table-cell; line-height: 1.5; background: none; }
+
+tbody tr th, tbody tr th p, tfoot tr th, tfoot tr th p { color: #222222; font-weight: bold; }
+
+td > div.verse { white-space: pre; }
+
+ol { margin-left: 0.25em; }
+
+ul li ol { margin-left: 0; }
+
+dl dd { margin-left: 1.125em; }
+
+dl dd:last-child, dl dd:last-child > :last-child { margin-bottom: 0; }
+
+ol > li p, ul > li p, ul dd, ol dd, .olist .olist, .ulist .ulist, .ulist .olist, .olist .ulist { margin-bottom: 0.625em; }
+
+ul.unstyled, ol.unnumbered, ul.checklist, ul.none { list-style-type: none; }
+
+ul.unstyled, ol.unnumbered, ul.checklist { margin-left: 0.625em; }
+
+ul.checklist li > p:first-child > i[class^="icon-check"]:first-child, ul.checklist li > p:first-child > input[type="checkbox"]:first-child { margin-right: 0.25em; }
+
+ul.checklist li > p:first-child > input[type="checkbox"]:first-child { position: relative; top: 1px; }
+
+ul.inline { margin: 0 auto 0.625em auto; margin-left: -1.375em; margin-right: 0; padding: 0; list-style: none; overflow: hidden; }
+ul.inline > li { list-style: none; float: left; margin-left: 1.375em; display: block; }
+ul.inline > li > * { display: block; }
+
+.unstyled dl dt { font-weight: normal; font-style: normal; }
+
+ol.arabic { list-style-type: decimal; }
+
+ol.decimal { list-style-type: decimal-leading-zero; }
+
+ol.loweralpha { list-style-type: lower-alpha; }
+
+ol.upperalpha { list-style-type: upper-alpha; }
+
+ol.lowerroman { list-style-type: lower-roman; }
+
+ol.upperroman { list-style-type: upper-roman; }
+
+ol.lowergreek { list-style-type: lower-greek; }
+
+.hdlist > table, .colist > table { border: 0; background: none; }
+.hdlist > table > tbody > tr, .colist > table > tbody > tr { background: none; }
+
+td.hdlist1 { padding-right: .75em; font-weight: bold; }
+
+td.hdlist1, td.hdlist2 { vertical-align: top; }
+
+.literalblock + .colist, .listingblock + .colist { margin-top: -0.5em; }
+
+.colist > table tr > td:first-of-type { padding: 0 .75em; line-height: 1; }
+.colist > table tr > td:last-of-type { padding: 0.25em 0; }
+
+.qanda > ol > li > p > em:only-child { color: #373737; }
+
+.thumb, .th { line-height: 0; display: inline-block; border: solid 4px white; -webkit-box-shadow: 0 0 0 1px #dddddd; box-shadow: 0 0 0 1px #dddddd; }
+
+.imageblock.left, .imageblock[style*="float: left"] { margin: 0.25em 0.625em 1.25em 0; }
+.imageblock.right, .imageblock[style*="float: right"] { margin: 0.25em 0 1.25em 0.625em; }
+.imageblock > .title { margin-bottom: 0; }
+.imageblock.thumb, .imageblock.th { border-width: 6px; }
+.imageblock.thumb > .title, .imageblock.th > .title { padding: 0 0.125em; }
+
+.image.left, .image.right { margin-top: 0.25em; margin-bottom: 0.25em; display: inline-block; line-height: 0; }
+.image.left { margin-right: 0.625em; }
+.image.right { margin-left: 0.625em; }
+
+a.image { text-decoration: none; }
+
+span.footnote, span.footnoteref { vertical-align: super; font-size: 0.875em; }
+span.footnote a, span.footnoteref a { text-decoration: none; }
+
+#footnotes { padding-top: 0.75em; padding-bottom: 0.75em; margin-bottom: 0.625em; }
+#footnotes hr { width: 20%; min-width: 6.25em; margin: -.25em 0 .75em 0; border-width: 1px 0 0 0; }
+#footnotes .footnote { padding: 0 0.375em; line-height: 1.3; font-size: 0.875em; margin-left: 1.2em; text-indent: -1.2em; margin-bottom: .2em; }
+#footnotes .footnote a:first-of-type { font-weight: bold; text-decoration: none; }
+#footnotes .footnote:last-of-type { margin-bottom: 0; }
+
+#content #footnotes { margin-top: -0.625em; margin-bottom: 0; padding: 0.75em 0; }
+
+.gist .file-data > table { border: none; background: #fff; width: 100%; margin-bottom: 0; }
+.gist .file-data > table td.line-data { width: 99%; }
+
+div.unbreakable { page-break-inside: avoid; }
+
+.big { font-size: larger; }
+
+.small { font-size: smaller; }
+
+.underline { text-decoration: underline; }
+
+.overline { text-decoration: overline; }
+
+.line-through { text-decoration: line-through; }
+
+.aqua { color: #00bfbf; }
+
+.aqua-background { background-color: #00fafa; }
+
+.black { color: black; }
+
+.black-background { background-color: black; }
+
+.blue { color: #0000bf; }
+
+.blue-background { background-color: #0000fa; }
+
+.fuchsia { color: #bf00bf; }
+
+.fuchsia-background { background-color: #fa00fa; }
+
+.gray { color: #606060; }
+
+.gray-background { background-color: #7d7d7d; }
+
+.green { color: #006000; }
+
+.green-background { background-color: #007d00; }
+
+.lime { color: #00bf00; }
+
+.lime-background { background-color: #00fa00; }
+
+.maroon { color: #600000; }
+
+.maroon-background { background-color: #7d0000; }
+
+.navy { color: #000060; }
+
+.navy-background { background-color: #00007d; }
+
+.olive { color: #606000; }
+
+.olive-background { background-color: #7d7d00; }
+
+.purple { color: #600060; }
+
+.purple-background { background-color: #7d007d; }
+
+.red { color: #bf0000; }
+
+.red-background { background-color: #fa0000; }
+
+.silver { color: #909090; }
+
+.silver-background { background-color: #bcbcbc; }
+
+.teal { color: #006060; }
+
+.teal-background { background-color: #007d7d; }
+
+.white { color: #bfbfbf; }
+
+.white-background { background-color: #fafafa; }
+
+.yellow { color: #bfbf00; }
+
+.yellow-background { background-color: #fafa00; }
+
+span.icon > [class^="icon-"], span.icon > [class*=" icon-"] { cursor: default; }
+
+.admonitionblock td.icon [class^="icon-"]:before { font-size: 2.5em; text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5); cursor: default; }
+.admonitionblock td.icon .icon-note:before { content: "\f05a"; color: #444444; color: #333333; }
+.admonitionblock td.icon .icon-tip:before { content: "\f0eb"; text-shadow: 1px 1px 2px rgba(155, 155, 0, 0.8); color: #111; }
+.admonitionblock td.icon .icon-warning:before { content: "\f071"; color: #bf6900; }
+.admonitionblock td.icon .icon-caution:before { content: "\f06d"; color: #bf3400; }
+.admonitionblock td.icon .icon-important:before { content: "\f06a"; color: #bf0000; }
+
+.conum { display: inline-block; color: white !important; background-color: black; -webkit-border-radius: 100px; border-radius: 100px; text-align: center; width: 20px; height: 20px; font-size: 12px; font-weight: bold; line-height: 20px; font-family: Arial, sans-serif; font-style: normal; position: relative; top: -2px; letter-spacing: -1px; }
+.conum * { color: white !important; }
+.conum + b { display: none; }
+.conum:after { content: attr(data-value); }
+.conum:not([data-value]):empty { display: none; }
+
+.listingblock code { white-space: pre; overflow: auto; overflow-wrap: normal; /* needed for webkit browsers */ }
+
+#toc ul.sectlevel0 > li > a { font-style: normal; font-weight: bold; }
+
+h4 { color: #6c818f; }
+
+.literalblock > .content > pre, .listingblock > .content > pre { -webkit-border-radius: 6px; border-radius: 6px; margin-left: 2em; margin-right: 2em; }
+
+.admonitionblock { margin-left: 2em; margin-right: 2em; }
+.admonitionblock > table { border: 1px solid #609060; border-top-width: 1.5em; background-color: #e9ffe9; border-collapse: separate; -webkit-border-radius: 0; border-radius: 0; }
+.admonitionblock > table td.icon { padding-top: .5em; padding-bottom: .5em; }
+.admonitionblock > table td.content { padding: .5em 1em; color: black; font-size: .9em; border-left: none; }
+
+.sidebarblock { background-color: #e8ecef; border-color: #ccc; }
+.sidebarblock > .content > .title { color: #444444; }
+
+table.tableblock.grid-all { border-collapse: collapse; -webkit-border-radius: 0; border-radius: 0; }
+table.tableblock.grid-all th.tableblock, table.tableblock.grid-all td.tableblock { border-bottom: 1px solid #aaa; }
+
+#footer { background-color: #465158; padding: 2em; }
+
+#footer-text { color: #eee; font-size: 0.8em; text-align: center; }
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/906f2441/docs/stylesheets/tinkerpop.css
----------------------------------------------------------------------
diff --git a/docs/stylesheets/tinkerpop.css b/docs/stylesheets/tinkerpop.css
index 89b6814..6d42956 100644
--- a/docs/stylesheets/tinkerpop.css
+++ b/docs/stylesheets/tinkerpop.css
@@ -692,3 +692,4 @@ table.tableblock.grid-all th.tableblock, table.tableblock.grid-all td.tableblock
#footer { background-color: #465158; padding: 2em; }
#footer-text { color: #eee; font-size: 0.8em; text-align: center; }
+.tabs{position:relative;margin:40px auto;width:1024px;max-width:100%;overflow:hidden;padding-top:10px;margin-bottom:60px}.tabs input{position:absolute;z-index:1000;height:50px;left:0;top:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0);cursor:pointer;margin:0}.tabs input:hover+label{background:#e08f24}.tabs label{background:#e9ffe9;color:#1a1a1a;font-size:15px;line-height:50px;height:60px;position:relative;top:0;padding:0 20px;float:left;display:block;letter-spacing:1px;text-transform:uppercase;font-weight:bold;text-align:center;box-shadow:2px 0 2px rgba(0,0,0,0.1),-2px 0 2px rgba(0,0,0,0.1);box-sizing:border-box;-webkit-transition:all 150ms ease 0s;transition:all 150ms ease 0s}.tabs label:hover{cursor:pointer}.tabs label:after{content:'';background:#609060;position:absolute;bottom:-2px;left:0;width:100%;height:2px;display:block}.tabs-2 input{width:50%}.tabs-2 input.tab-selector-1{left:0%}.tabs-2 input.tab-selector-2{left:50%}.tabs-
2 label{width:50%}.tabs-3 input{width:33.33333%}.tabs-3 input.tab-selector-1{left:0%}.tabs-3 input.tab-selector-2{left:33.33333%}.tabs-3 input.tab-selector-3{left:66.66667%}.tabs-3 label{width:33.33333%}.tabs-4 input{width:25%}.tabs-4 input.tab-selector-1{left:0%}.tabs-4 input.tab-selector-2{left:25%}.tabs-4 input.tab-selector-3{left:50%}.tabs-4 input.tab-selector-4{left:75%}.tabs-4 label{width:25%}.tabs label:first-of-type{z-index:4}.tab-label-2{z-index:4}.tab-label-3{z-index:3}.tab-label-4{z-index:2}.tabs input:checked+label{background:#609060;color:#fefefe;z-index:6}.clear-shadow{clear:both}.tabcontent{height:auto;width:100%;float:left;position:relative;z-index:5;background:#eee;top:-10px;box-sizing:border-box}.tabcontent>div{position:relative;float:left;width:0;height:0;box-sizing:border-box;top:0;left:0;z-index:1;opacity:0;background:#eee}.tabcontent .CodeRay{background-color:#fefefe}.tabs .tab-selector-1:checked ~ .tabcontent .tabcontent-1{z-index:100;-ms-filter:"progid:DXImag
eTransform.Microsoft.Alpha(Opacity=100)";filter:alpha(opacity=100);opacity:1;width:100%;height:auto;width:100%;height:auto;padding-top:30px}.tabs .tab-selector-2:checked ~ .tabcontent .tabcontent-2{z-index:100;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";filter:alpha(opacity=100);opacity:1;width:100%;height:auto;width:100%;height:auto;padding-top:30px}.tabs .tab-selector-3:checked ~ .tabcontent .tabcontent-3{z-index:100;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";filter:alpha(opacity=100);opacity:1;width:100%;height:auto;width:100%;height:auto;padding-top:30px}.tabs .tab-selector-4:checked ~ .tabcontent .tabcontent-4{z-index:100;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";filter:alpha(opacity=100);opacity:1;width:100%;height:auto;width:100%;height:auto;padding-top:30px}
[16/50] [abbrv] tinkerpop git commit: Missed updating NOTICE files
for last two bumps of Groovy CTR
Posted by sp...@apache.org.
Missed updating NOTICE files for last two bumps of Groovy CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cfbe2ce7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cfbe2ce7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cfbe2ce7
Branch: refs/heads/TINKERPOP-1956
Commit: cfbe2ce7fedb7de07e2c0760ee31f9a8d8a4b60c
Parents: 2f8f74a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 11:27:30 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 10 11:27:30 2018 -0400
----------------------------------------------------------------------
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 4931f7e..f34965b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index 72c10cc..0883bc4 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -11,7 +11,7 @@ This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
------------------------------------------------------------------------
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
[05/50] [abbrv] tinkerpop git commit: CTR: tweaked release validation
script
Posted by sp...@apache.org.
CTR: tweaked release validation script
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e9ab93aa
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e9ab93aa
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e9ab93aa
Branch: refs/heads/TINKERPOP-1956
Commit: e9ab93aa2df3ddc3d9271ebaa6543a82bc487f62
Parents: 8671622
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed May 2 09:38:57 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed May 2 09:38:57 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e9ab93aa/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index b071ea0..76e0974 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -26,6 +26,7 @@
# curl -L -O https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS
# gpg --import KEYS
+COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | grep -Po '(?<=<...@apache.org>)' | uniq)
TMP_DIR="/tmp/tpdv"
# Required. Only the latest version on each release stream is available on dist.
@@ -72,6 +73,8 @@ mkdir -p ${TMP_DIR}
rm -rf ${TMP_DIR}/*
cd ${TMP_DIR}
+curl -Ls https://people.apache.org/keys/committer/ | grep -v invalid > ${TMP_DIR}/.committers
+
# validate downloads
ZIP_FILENAME=`grep -o '[^/]*$' <<< ${URL}`
DIR_NAME=`sed -e 's/-[^-]*$//' <<< ${ZIP_FILENAME}`
@@ -94,11 +97,24 @@ echo "OK"
echo "* validating signatures and checksums ... "
echo -n " * PGP signature ... "
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Stephen Mallette <sp...@apache.org>"$'` -eq 1 ] || \
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Marko Rodriguez <ok...@apache.org>"$'` -eq 1 ] || \
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Theodore Ratte Wilmes (CODE SIGNING KEY) <tw...@apache.org>"'` -eq 1 ] || \
-[ `gpg ${ZIP_FILENAME}.asc 2>&1 | grep -c '^gpg: Good signature from "Jason Plurad (CODE SIGNING KEY) <pl...@apache.org>"'` -eq 1 ] || \
-{ echo "failed"; exit 1; }
+gpg --verify ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1
+
+verified=0
+
+for committer in ${COMMITTERS[@]}
+do
+ if [[ `grep -F ${committer} ${TMP_DIR}/.verify` ]]; then
+ fp=$(cat ${TMP_DIR}/.committers | grep "id='${committer}'" | grep -Po '(?<=>)[A-Z0-9 ]*(?=<)' 2> /dev/null)
+ if [ ! -z "${fp}" ]; then
+ if [[ `grep -F "${fp}" ${TMP_DIR}/.verify` ]]; then
+ verified=1
+ fi
+ fi
+ fi
+ [ ${verified} -eq 1 ] && break
+done
+
+[ ${verified} -eq 1 ] || { echo "failed"; exit 1; }
echo "OK"
echo -n " * MD5 checksum ... "
[02/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1943'
into tp33
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1943' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/99845d4f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/99845d4f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/99845d4f
Branch: refs/heads/TINKERPOP-1956
Commit: 99845d4f152083940a6ed70fe8a5559476149e51
Parents: 7d8cb06 9357c9e
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Tue May 1 20:24:38 2018 +0200
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Tue May 1 20:24:38 2018 +0200
----------------------------------------------------------------------
.../lib/driver/driver-remote-connection.js | 2 +-
.../lib/structure/io/graph-serializer.js | 11 ++-
.../lib/structure/io/type-serializers.js | 81 ++++++++++++++++++++
.../test/cucumber/feature-steps.js | 4 +-
.../gremlin-javascript/test/cucumber/world.js | 10 +--
5 files changed, 96 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
[29/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/eb79f398
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/eb79f398
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/eb79f398
Branch: refs/heads/TINKERPOP-1956
Commit: eb79f398d10bd1294762b923d2bdc8d72959b7e9
Parents: 68d39dc 288b455
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 20:04:35 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 20:04:35 2018 -0400
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/eb79f398/pom.xml
----------------------------------------------------------------------
[34/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/81ea06a0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/81ea06a0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/81ea06a0
Branch: refs/heads/TINKERPOP-1956
Commit: 81ea06a0fa9087467c059f63907535c81d083404
Parents: 044cd1f 90e7476
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 10:55:36 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 10:55:36 2018 -0400
----------------------------------------------------------------------
.../developer/development-environment.asciidoc | 56 ++++++++++----------
docs/src/dev/developer/release.asciidoc | 46 ++++++++--------
2 files changed, 51 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ea06a0/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/81ea06a0/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
[09/50] [abbrv] tinkerpop git commit: Minor updates to pre-flight
check docs CTR
Posted by sp...@apache.org.
Minor updates to pre-flight check docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ea594461
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ea594461
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ea594461
Branch: refs/heads/TINKERPOP-1956
Commit: ea594461ef15edc6daa2129199ac3c45706b76d9
Parents: 153a01b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 7 08:01:30 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 7 08:01:30 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ea594461/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 9439abb..aad2bca 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -127,14 +127,9 @@ during this period.
... All tickets not marked "Fixed", "Done", or "Implemented" for their Resolution should not have a Fix Version
assigned (use common sense when reviewing these tickets before removing the Fix Version as it is possible the incorrect
Resolution may have been assigned).
-.. Update `gremlin-io-test` (from 3.3.0 on - this module was not available prior to the 3.3.x line):
-... Build new test files with `mvn clean install -pl gremlin-tools/gremlin-io-test -Dio`
-... If necessary copy relevant portions of IO dev documentation from `target/dev-docs` to the actual asciidoc file at `docs/src/dev/io` (this is basically just for GraphSON).
-... Generate test files for other lines of TinkerPop releases that don't have `gremlin-io-test` to automate that process (refers to the 3.2.x line):
-.... Scripts to "back generate" test data files can be found in the comments of `docs/src/dev/io/graphson.asciidoc`and `docs/src/dev/io/gryo.asciidoc` and can be pasted into a Gremlin Console instance that matches the target version expected of the test files. Once generated these files can be copied to the branch that requires them.
-.... It is worth double checking the output file counts against past versions as the number of files should match. Obviously, if new test types were added to the model then those would have to be accounted for. Update the scripts as necessary.
-.... The `CompatibilitiesTest` will need to be updated - it is a troublesome test which needs to be adjusted on each release (doesn't appear to be a good way to test all of its features without this hassle).
-... Commit and push all files to the repository after doing a build with `mvn clean install` to verify that there are no problems.
+.. Be sure that `gremlin-io-test` has been updated (from 3.3.0 on - this module was not available prior to the 3.3.x line)
+... This is typically a post-release task, but it's worthing checking to be sure in case the step was somehow overlooked.
+... Instructions for updating the module are described in the <<io,IO Documentation and Testing Section>>.
. When all documentation changes are in place, use `bin/publish-docs.sh` to deploy a final `SNAPSHOT` representation
of the docs and thus validate that there are no issues with the documentation generation process. Request review
of the published documentation on the dev mailing list.
[44/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5171afd9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5171afd9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5171afd9
Branch: refs/heads/TINKERPOP-1956
Commit: 5171afd9f408feab5c7bfcdce13a44e5ec89e823
Parents: 0b282e4 4adca20
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 16:36:27 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 16:36:27 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5171afd9/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
[48/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef2cd572
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef2cd572
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef2cd572
Branch: refs/heads/TINKERPOP-1956
Commit: ef2cd5720e291038c8f3f1dea105e76cf740b153
Parents: b04e024 ae562c1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 17 15:42:24 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 17 15:42:24 2018 -0400
----------------------------------------------------------------------
.../computer/traversal/TraversalVertexProgram.java | 17 +++++++++--------
.../traversal/dsl/graph/GraphTraversal.java | 6 +++---
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef2cd572/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
[20/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b63e2f96
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b63e2f96
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b63e2f96
Branch: refs/heads/TINKERPOP-1956
Commit: b63e2f96a88c4c8f811cd12cfdfe5ac63ad2d4bb
Parents: e574906 ac161fa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 11:57:34 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 10 11:57:34 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b63e2f96/CHANGELOG.asciidoc
----------------------------------------------------------------------
[46/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b04e0240
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b04e0240
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b04e0240
Branch: refs/heads/TINKERPOP-1956
Commit: b04e02406d8b29fc3967a5aa6842e72e82d90817
Parents: 5171afd 699a5aa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 15 15:42:18 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 15 15:42:18 2018 -0400
----------------------------------------------------------------------
.travis.yml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
[21/50] [abbrv] tinkerpop git commit: Bump to 3.2.10-SNAPSHOT -
double digits!! CTR
Posted by sp...@apache.org.
Bump to 3.2.10-SNAPSHOT - double digits!! CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d9959725
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d9959725
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d9959725
Branch: refs/heads/TINKERPOP-1956
Commit: d995972524cdb168e897cad4e85bb9a1a2310ab9
Parents: ac161fa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 14:09:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:09:00 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 ++++
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 7 +++++++
giraph-gremlin/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-server/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
gremlin-archetype/pom.xml | 2 +-
gremlin-benchmark/pom.xml | 2 +-
gremlin-console/bin/gremlin.sh | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-core/pom.xml | 2 +-
gremlin-dotnet/pom.xml | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 ++--
gremlin-dotnet/src/pom.xml | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
gremlin-driver/pom.xml | 2 +-
gremlin-groovy-test/pom.xml | 2 +-
gremlin-groovy/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
gremlin-python/pom.xml | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-shaded/pom.xml | 2 +-
gremlin-test/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
tinkergraph-gremlin/pom.xml | 2 +-
29 files changed, 39 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 62c412e..41d83c4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,6 +20,10 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
+[[release-3-2-10]]
+=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+
+
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 06e4f59..b5eb3b3 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -21,6 +21,13 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
*Nine Inch Gremlins*
+== TinkerPop 3.2.10
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.asciidoc#release-3-2-10[changelog] for a complete list of all the modifications that are part of this release.
+
+
== TinkerPop 3.2.9
*Release Date: May 8, 2018*
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 69355be..21f7389 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>giraph-gremlin</artifactId>
<name>Apache TinkerPop :: Giraph Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 4dd6297..9e412b1 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index eedbd56..5f07170 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-server</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index ecf5a50..f7b1b5a 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-tinkergraph</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 9f929af..81c54ff 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml
index bcce1ef..9405392 100644
--- a/gremlin-benchmark/pom.xml
+++ b/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index cdf1153..14dda62 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.2.9-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.2.10-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 7581397..49e7f4a 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-console</artifactId>
<name>Apache TinkerPop :: Gremlin Console</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 78bffa5..bf81ca1 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 10f5791..fd2d428 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index ad85e56..ff3b2a2 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,8 +25,8 @@ limitations under the License.
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.2.9</Version>
- <FileVersion>3.2.9.0</FileVersion>
+ <Version>3.2.10-SNAPSHOT</Version>
+ <FileVersion>3.2.10.0</FileVersion>
<AssemblyVersion>3.2.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
<Authors>Apache TinkerPop</Authors>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 9769b62..f913692 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 8c49ae9..db1f8ad 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 4ba9339..a7835ab 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index cc21f8b..a04f3b2 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-groovy-test</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 627893a..64405f5 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-groovy</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 29da33d..0fe6bf4 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index aa64bfb..62b53ef 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlin",
- "version": "3.2.9",
+ "version": "3.2.10-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 8340560..c999877 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-python</artifactId>
<name>Apache TinkerPop :: Gremlin Python</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 1b38dff..68733a9 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-server</artifactId>
<name>Apache TinkerPop :: Gremlin Server</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index f40a3ed..192262d 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-shaded</artifactId>
<name>Apache TinkerPop :: Gremlin Shaded</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 66e1a3e..652b346 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index a596db5..b094470 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index e77f83e..b0a5e5f 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 379db49..6b24199 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index feb339b..ff0b11d 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>spark-gremlin</artifactId>
<name>Apache TinkerPop :: Spark Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d9959725/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index c842275..1ff0aa0 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9</version>
+ <version>3.2.10-SNAPSHOT</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
[26/50] [abbrv] tinkerpop git commit: Update to 3.3.4-SNAPSHOT CTR
Posted by sp...@apache.org.
Update to 3.3.4-SNAPSHOT CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71b03ff9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71b03ff9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71b03ff9
Branch: refs/heads/TINKERPOP-1956
Commit: 71b03ff99a520eddf2b9ee848e0c8da28db2ead0
Parents: bfdd4c2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 14:50:01 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:50:01 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 ++++++
docs/src/upgrade/release-3.3.x.asciidoc | 7 +++++++
giraph-gremlin/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-server/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
gremlin-archetype/pom.xml | 2 +-
gremlin-console/bin/gremlin.sh | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-core/pom.xml | 2 +-
gremlin-dotnet/pom.xml | 2 +-
gremlin-dotnet/src/pom.xml | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
gremlin-driver/pom.xml | 2 +-
gremlin-groovy/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
gremlin-python/pom.xml | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-shaded/pom.xml | 2 +-
gremlin-test/pom.xml | 2 +-
gremlin-tools/gremlin-benchmark/pom.xml | 2 +-
gremlin-tools/gremlin-coverage/pom.xml | 2 +-
gremlin-tools/gremlin-io-test/pom.xml | 2 +-
gremlin-tools/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
tinkergraph-gremlin/pom.xml | 2 +-
29 files changed, 40 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 5edda9e..7f8efcf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,6 +20,12 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-mozart.png[width=185]
+[[release-3-3-4]]
+=== TinkerPop 3.3.4 (Release Date: NOT OFFICIALLY RELEASED YET)
+
+This release also includes changes from <<release-3-2-10, 3.2.10>>.
+
+
[[release-3-3-3]]
=== TinkerPop 3.3.3 (Release Date: May 8, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 468616b..ea2e159 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -21,6 +21,13 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
*Gremlin Symphony #40 in G Minor*
+== TinkerPop 3.3.4
+
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.3.4/CHANGELOG.asciidoc#release-3-3-4[changelog] for a complete list of all the modifications that are part of this release.
+
+
== TinkerPop 3.3.3
*Release Date: May 8, 2018*
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 5c8e7fe..3cca330 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>giraph-gremlin</artifactId>
<name>Apache TinkerPop :: Giraph Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 812172b..535bd43 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 409f3c8..e237da7 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-server</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index 5ccbe0c..70391f6 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype-tinkergraph</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 79a8507..93bb813 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 7fb090f..ec5a25b 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.3.3-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.3.4-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index d78d2a2..8c7a59e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-console</artifactId>
<name>Apache TinkerPop :: Gremlin Console</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index b2b168b..db723f4 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 192e4a7..38f3d70 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 83c4a53..05303ee 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index f51b421..42477aa 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 40f35c3..738a338 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index d6724f7..ea0556c 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-groovy</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 7dd40fb..768e111 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index ba5f210..6bf3fe3 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-python</artifactId>
<name>Apache TinkerPop :: Gremlin Python</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 4a8b1ad..d4cbd19 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-server</artifactId>
<name>Apache TinkerPop :: Gremlin Server</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index f565761..7bdffd3 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-shaded</artifactId>
<name>Apache TinkerPop :: Gremlin Shaded</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index f666d03..6929aa5 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-tools/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-benchmark/pom.xml b/gremlin-tools/gremlin-benchmark/pom.xml
index ee343fd..43c1127 100644
--- a/gremlin-tools/gremlin-benchmark/pom.xml
+++ b/gremlin-tools/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-tools/gremlin-coverage/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-coverage/pom.xml b/gremlin-tools/gremlin-coverage/pom.xml
index a934168..83b13ab 100644
--- a/gremlin-tools/gremlin-coverage/pom.xml
+++ b/gremlin-tools/gremlin-coverage/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-coverage</artifactId>
<name>Apache TinkerPop :: Gremlin Coverage</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-tools/gremlin-io-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
index a3fdeeb..8ab35fd 100644
--- a/gremlin-tools/gremlin-io-test/pom.xml
+++ b/gremlin-tools/gremlin-io-test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-io-test</artifactId>
<name>Apache TinkerPop :: Gremlin IO Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/gremlin-tools/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/pom.xml b/gremlin-tools/pom.xml
index bcb7abf..70c643e 100644
--- a/gremlin-tools/pom.xml
+++ b/gremlin-tools/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>gremlin-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index ccb5d55..11d9315 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 641b9df..f1b80f7 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7fc8ac3..638d023 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 663bb80..024712c 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>spark-gremlin</artifactId>
<name>Apache TinkerPop :: Spark Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71b03ff9/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index f6e60c7..4b858a6 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3</version>
+ <version>3.3.4-SNAPSHOT</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
[25/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
docs/src/dev/developer/development-environment.asciidoc
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bfdd4c24
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bfdd4c24
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bfdd4c24
Branch: refs/heads/TINKERPOP-1956
Commit: bfdd4c2477f92e8f0ef7a73fddd95d599b670ce7
Parents: d492136 3635ff6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 14:48:07 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:48:07 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 ++
.../developer/development-environment.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 7 +++
gremlin-dotnet/pom.xml | 17 +++++--
gremlin-groovy/pom.xml | 6 ---
gremlin-javascript/pom.xml | 47 ++++----------------
gremlin-python/pom.xml | 4 +-
pom.xml | 19 +++++---
8 files changed, 48 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-groovy/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-javascript/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/gremlin-python/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfdd4c24/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3ef4da9,9737fef..7fc8ac3
--- a/pom.xml
+++ b/pom.xml
@@@ -451,9 -375,10 +457,9 @@@ limitations under the License
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
+ <version>2.21.0</version>
<configuration>
- <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory}
- -Dis.testing=true
+ <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true
</argLine>
<excludes>
<exclude>**/*IntegrateTest.java</exclude>
[50/50] [abbrv] tinkerpop git commit: TINKERPOP-1956 Deprecated
Order.incr and Order.decr
Posted by sp...@apache.org.
TINKERPOP-1956 Deprecated Order.incr and Order.decr
Replaced by Order.asc and Order.desc respectively. Left a number of uses of decr/incr so as to ensure ongoing compatibility during deprecation.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/20a722a3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/20a722a3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/20a722a3
Branch: refs/heads/TINKERPOP-1956
Commit: 20a722a35785497e80ae3097b4c47b277eed600a
Parents: ef2cd57
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Apr 27 06:22:13 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 17 16:05:04 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
docs/site/home/gremlin.html | 4 +-
docs/site/home/index.html | 2 +-
docs/site/home/js/prism.js | 2 +-
docs/src/dev/io/graphson.asciidoc | 8 +-
docs/src/dev/io/gryo.asciidoc | 4 +-
docs/src/recipes/centrality.asciidoc | 6 +-
docs/src/recipes/collections.asciidoc | 2 +-
docs/src/recipes/recommendation.asciidoc | 16 +-
docs/src/recipes/style-guide.asciidoc | 4 +-
docs/src/reference/gremlin-variants.asciidoc | 10 +-
docs/src/reference/the-graph.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 61 ++++----
.../gremlin-language-variants/index.asciidoc | 2 +-
docs/src/upgrade/release-3.3.x.asciidoc | 10 ++
.../gremlin/process/traversal/Order.java | 40 +++++
.../traversal/step/map/OrderGlobalStep.java | 4 +-
.../traversal/step/map/OrderLocalStep.java | 4 +-
.../util/function/ChainedComparator.java | 2 +-
.../gremlin/util/function/MultiComparator.java | 2 +-
.../gremlin/process/traversal/BytecodeTest.java | 6 +-
.../gremlin/process/traversal/OrderTest.java | 15 ++
.../traversal/step/map/OrderGlobalStepTest.java | 8 +-
.../traversal/step/map/OrderLocalStepTest.java | 8 +-
.../PathRetractionStrategyTest.java | 2 +-
.../LambdaRestrictionStrategyTest.java | 4 +-
.../util/function/MultiComparatorTest.java | 6 +-
.../Process/Traversal/NamingConversions.cs | 2 +
.../src/Gremlin.Net/Process/Traversal/Order.cs | 6 +
.../DriverRemoteConnection/EnumTests.cs | 2 +-
.../gremlin-javascript/lib/process/traversal.js | 2 +-
.../test/unit/traversal-test.js | 4 +-
.../jython/gremlin_python/process/traversal.py | 4 +-
gremlin-test/features/branch/Local.feature | 2 +-
gremlin-test/features/filter/Dedup.feature | 4 +-
gremlin-test/features/map/AddEdge.feature | 4 +-
gremlin-test/features/map/Match.feature | 4 +-
gremlin-test/features/map/Order.feature | 72 ++++++---
gremlin-test/features/map/Project.feature | 4 +-
gremlin-test/features/map/Select.feature | 4 +-
.../process/traversal/step/ComplexTest.java | 4 +-
.../traversal/step/branch/LocalTest.java | 2 +-
.../traversal/step/filter/DedupTest.java | 10 +-
.../process/traversal/step/map/AddEdgeTest.java | 12 +-
.../process/traversal/step/map/MatchTest.java | 12 +-
.../process/traversal/step/map/MathTest.java | 12 +-
.../process/traversal/step/map/OrderTest.java | 150 +++++++++++--------
.../traversal/step/map/PageRankTest.java | 20 +--
.../process/traversal/step/map/ProgramTest.java | 10 +-
.../process/traversal/step/map/ProjectTest.java | 10 +-
.../process/traversal/step/map/SelectTest.java | 10 +-
.../decoration/SubgraphStrategyProcessTest.java | 2 +-
.../gremlin/process/FeatureCoverageTest.java | 4 +-
.../tinkerpop/gremlin/structure/io/Model.java | 2 +-
.../io/AbstractTypedCompatibilityTest.java | 2 -
.../io/graphson/_3_2_3/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_3/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_4/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_4/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_5/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_5/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_6/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_6/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_7/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_7/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_8/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_8/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_2_9/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_2_9/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_3_0/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_3_0/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_3_0/order-v3d0.json | 2 +-
.../io/graphson/_3_3_1/order-v2d0-no-types.json | 2 +-
.../io/graphson/_3_3_1/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_3_1/order-v3d0.json | 2 +-
.../io/graphson/_3_3_2/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_3_2/order-v3d0.json | 2 +-
.../io/graphson/_3_3_3/order-v2d0-partial.json | 2 +-
.../io/graphson/_3_3_3/order-v3d0.json | 2 +-
.../structure/io/gryo/_3_2_3/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_2_4/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_2_5/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_2_6/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_2_7/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_2_8/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_2_9/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_3_0/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_3_0/order-v3d0.kryo | 2 +-
.../structure/io/gryo/_3_3_1/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_3_1/order-v3d0.kryo | 2 +-
.../structure/io/gryo/_3_3_2/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_3_2/order-v3d0.kryo | 2 +-
.../structure/io/gryo/_3_3_3/order-v1d0.kryo | 2 +-
.../structure/io/gryo/_3_3_3/order-v3d0.kryo | 2 +-
94 files changed, 421 insertions(+), 268 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 718b6a7..81210c4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
This release also includes changes from <<release-3-2-10, 3.2.10>>.
+* Deprecated `Order` for `incr` and `decr` in favor of `asc` and `desc`.
[[release-3-3-3]]
=== TinkerPop 3.3.3 (Release Date: May 8, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/site/home/gremlin.html
----------------------------------------------------------------------
diff --git a/docs/site/home/gremlin.html b/docs/site/home/gremlin.html
index bedddf3..74e7c5e 100644
--- a/docs/site/home/gremlin.html
+++ b/docs/site/home/gremlin.html
@@ -153,7 +153,7 @@ g.V().has("name","gremlin").
out("bought").aggregate("stash").
in("bought").out("bought").
where(not(within("stash"))).
- groupCount().order(local).by(values,decr)
+ groupCount().order(local).by(values,desc)
</code></pre>
</div>
<div class="col-xs-7" style="border-left: thin solid #000000;height:148px">
@@ -177,7 +177,7 @@ g.V().hasLabel("person").
pageRank().
by("friendRank").
by(outE("knows")).
- order().by("friendRank",decr).
+ order().by("friendRank",desc).
limit(10)</code></pre>
</div>
<div class="col-xs-7" style="border-left: thin solid #000000;height:148px">
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/site/home/index.html
----------------------------------------------------------------------
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index 9ee55c5..19d12ee 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -133,7 +133,7 @@ limitations under the License.
in("bought").out("bought").
where(not(within("stash"))).
groupCount().
- order(local).by(values,decr)
+ order(local).by(values,desc)
</code></pre>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/site/home/js/prism.js
----------------------------------------------------------------------
diff --git a/docs/site/home/js/prism.js b/docs/site/home/js/prism.js
index 53661dd..999a43e 100644
--- a/docs/site/home/js/prism.js
+++ b/docs/site/home/js/prism.js
@@ -233,7 +233,7 @@ Prism.languages.clike = {
punctuation: /[{}[\];(),.:]/
};
Prism.languages.gremlin = Prism.languages.extend("clike", {
- keyword: /\b(values,|decr|incr|local|global|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,
+ keyword: /\b(values,|decr|desc|incr|asc|local|global|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,
number: /\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,
"function": /[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i
}), Prism.languages.insertBefore("gremlin", "keyword", {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/dev/io/graphson.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/io/graphson.asciidoc b/docs/src/dev/io/graphson.asciidoc
index defebb3..d140a2f 100644
--- a/docs/src/dev/io/graphson.asciidoc
+++ b/docs/src/dev/io/graphson.asciidoc
@@ -143,7 +143,7 @@ file.withWriter { writer ->
writer.write(toJson(Column.keys, "Column", "", "v2d0-partial"))
writer.write(toJson(Direction.OUT, "Direction", "", "v2d0-partial"))
writer.write(toJson(Operator.sum, "Operator", "", "v2d0-partial"))
- writer.write(toJson(Order.incr, "Order", "", "v2d0-partial"))
+ writer.write(toJson(Order.shuffle, "Order", "", "v2d0-partial"))
writer.write(toJson(org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick.any, "Pick", "", "v2d0-partial"))
writer.write(toJson(Pop.all, "Pop", "", "v2d0-partial"))
writer.write(toJson(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "", "v2d0-partial"))
@@ -272,7 +272,7 @@ file.withWriter { writer ->
writer.write(toJson(Column.keys, "Column", "", "v2d0-no-types"))
writer.write(toJson(Direction.OUT, "Direction", "", "v2d0-no-types"))
writer.write(toJson(Operator.sum, "Operator", "", "v2d0-no-types"))
- writer.write(toJson(Order.incr, "Order", "", "v2d0-no-types"))
+ writer.write(toJson(Order.shuffle, "Order", "", "v2d0-no-types"))
writer.write(toJson(Pop.all, "Pop", "", "v2d0-no-types"))
writer.write(toJson(org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick.any, "Pick", "", "v2d0-no-types"))
writer.write(toJson(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "", "v2d0-no-types"))
@@ -2777,7 +2777,7 @@ The following `Bytecode` example represents the traversal of `g.V().hasLabel('pe
----
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
----
@@ -5138,7 +5138,7 @@ The following `Bytecode` example represents the traversal of `g.V().hasLabel('pe
----
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
----
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/dev/io/gryo.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/io/gryo.asciidoc b/docs/src/dev/io/gryo.asciidoc
index c824063..f327222 100644
--- a/docs/src/dev/io/gryo.asciidoc
+++ b/docs/src/dev/io/gryo.asciidoc
@@ -36,7 +36,7 @@ conf.setProperty(TinkerGraph.GREMLIN_TINKERGRAPH_DEFAULT_VERTEX_PROPERTY_CARDINA
graph = TinkerGraph.open(conf)
TinkerFactory.generateTheCrew(graph)
g = graph.traversal()
-
+
toGryo = { o, type, mapper, suffix = "" ->
def fileToWriteTo = new File("io-output/test-case-data/gryo/" + type.toLowerCase().replace(" ","") + "-" + suffix + ".kryo")
if (fileToWriteTo.exists()) fileToWriteTo.delete()
@@ -75,7 +75,7 @@ toGryo(VertexProperty.Cardinality.list, "Cardinality", mapper, "v1d0")
toGryo(Column.keys, "Column", mapper, "v1d0")
toGryo(Direction.OUT, "Direction", mapper, "v1d0")
toGryo(Operator.sum, "Operator", mapper, "v1d0")
-toGryo(Order.incr, "Order", mapper, "v1d0")
+toGryo(Order.shuffle, "Order", mapper, "v1d0")
toGryo(Pop.all, "Pop", mapper, "v1d0")
toGryo(org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent.Pick.any, "Pick", mapper, "v1d0")
toGryo(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", mapper, "v1d0")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/recipes/centrality.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/centrality.asciidoc b/docs/src/recipes/centrality.asciidoc
index 1a3927e..8504589 100644
--- a/docs/src/recipes/centrality.asciidoc
+++ b/docs/src/recipes/centrality.asciidoc
@@ -34,7 +34,7 @@ g.V().group().by().by(inE().count()) <2>
g.V().group().by().by(outE().count()) <3>
g.V().project("v","degree").by().by(bothE().count()) <4>
g.V().project("v","degree").by().by(bothE().count()). <5>
- order().by(select("degree"), decr).
+ order().by(select("degree"), desc).
limit(4)
----
@@ -158,9 +158,9 @@ give it the highest rank. Consider the following example using the Grateful Dead
----
graph.io(graphml()).readGraph('data/grateful-dead.xml')
g.V().repeat(groupCount('m').by('name').out()).times(5).cap('m'). <1>
- order(local).by(values, decr).limit(local, 10).next() <2>
+ order(local).by(values, desc).limit(local, 10).next() <2>
g.V().repeat(groupCount('m').by('name').out().timeLimit(100)).times(5).cap('m'). <3>
- order(local).by(values, decr).limit(local, 10).next()
+ order(local).by(values, desc).limit(local, 10).next()
----
<1> The traversal iterates through each vertex in the graph and for each one repeatedly group counts each vertex that
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/recipes/collections.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/collections.asciidoc b/docs/src/recipes/collections.asciidoc
index d027376..7ee4b1b 100644
--- a/docs/src/recipes/collections.asciidoc
+++ b/docs/src/recipes/collections.asciidoc
@@ -97,7 +97,7 @@ g.V().union(limit(3).fold(),tail(3).fold()) <1>
g.V().union(limit(3).fold(),tail(3).fold()).
local(unfold(). <2>
order().
- by(bothE().count(),decr).
+ by(bothE().count(),desc).
limit(1).
fold())
g.V().union(limit(3).fold(),tail(3).fold()). <3>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/recipes/recommendation.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/recommendation.asciidoc b/docs/src/recipes/recommendation.asciidoc
index 9fefce2..aa4feb6 100644
--- a/docs/src/recipes/recommendation.asciidoc
+++ b/docs/src/recipes/recommendation.asciidoc
@@ -134,7 +134,7 @@ g.V().has('person','name','alice').as('her'). <1>
out('bought').where(without('self')). <4>
groupCount().
order(local).
- by(values, decr) <5>
+ by(values, desc) <5>
----
<1> Find "alice" who is the person for whom the product recommendation is being made.
@@ -183,7 +183,7 @@ g.V().has("person","name","alice").as("alice").
where(within("self")).count()).
select(values).
order(local).
- by(decr).limit(local, 1)
+ by(desc).limit(local, 1)
----
With the maximum value available, it can be used to chose those "person" vertices that have the three products in
@@ -199,7 +199,7 @@ g.V().has("person","name","alice").as("alice").
where(within("self")).count()).as("g").
select(values).
order(local).
- by(decr).limit(local, 1).as("m").
+ by(desc).limit(local, 1).as("m").
select("g").unfold().
where(select(values).as("m")).select(keys)
----
@@ -217,7 +217,7 @@ g.V().has("person","name","alice").as("alice").
where(within("self")).count()).as("g").
select(values).
order(local).
- by(decr).limit(local, 1).as("m").
+ by(desc).limit(local, 1).as("m").
select("g").unfold().
where(select(values).as("m")).select(keys).
out("bought").where(without("self"))
@@ -235,13 +235,13 @@ g.V().has("person","name","alice").as("alice").
where(within("self")).count()).as("g").
select(values).
order(local).
- by(decr).limit(local, 1).as("m").
+ by(desc).limit(local, 1).as("m").
select("g").unfold().
where(select(values).as("m")).select(keys).
out("bought").where(without("self")).
groupCount().
order(local).
- by(values, decr).
+ by(values, desc).
by(select(keys).values("name")).
unfold().select(keys).values("name")
----
@@ -257,7 +257,7 @@ g.V().has('person','name','alice').as('her').
out('bought').where(without('self')).
groupCount().
order(local).
- by(values, decr)
+ by(values, desc)
----
The above traversal performs a full ranking of items based on all the connected data. That could be a time consuming
@@ -280,7 +280,7 @@ g.V().has('person','name','alice').as('her').
out('bought').where(without('self')).timeLimit(1000).
groupCount().
order(local).
- by(values, decr)
+ by(values, desc)
----
In using sampling methods, it is important to consider that the natural ordering of edges in the graph may not produce
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/recipes/style-guide.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/style-guide.asciidoc b/docs/src/recipes/style-guide.asciidoc
index 6da682d..de2aa08 100644
--- a/docs/src/recipes/style-guide.asciidoc
+++ b/docs/src/recipes/style-guide.asciidoc
@@ -49,8 +49,8 @@ g.V().out('knows').out('created'). <1>
select('java').unfold(). <3>
in('created').hasLabel('person'). <4>
order(). <5>
- by(inE().count(),decr). <6>
- by('age',incr).
+ by(inE().count(),desc). <6>
+ by('age',asc).
dedup().limit(10).values('name') <7>
----
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/reference/gremlin-variants.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index cff14e1..8aa2435 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -214,7 +214,7 @@ These can be used analogously to how they are used in Gremlin-Java.
[gremlin-python,modern]
----
-g.V().hasLabel('person').has('age',P.gt(30)).order().by('age',Order.decr).toList()
+g.V().hasLabel('person').has('age',P.gt(30)).order().by('age',Order.desc).toList()
----
Moreover, by importing the `statics` of Gremlin-Python, the class prefixes can be omitted.
@@ -226,7 +226,7 @@ With statics loaded its possible to represent the above traversal as below.
[gremlin-python,modern]
----
-g.V().hasLabel('person').has('age',gt(30)).order().by('age',decr).toList()
+g.V().hasLabel('person').has('age',gt(30)).order().by('age',desc).toList()
----
Finally, statics includes all the `__`-methods and thus, anonymous traversals like `__.out()` can be expressed as below.
@@ -373,7 +373,7 @@ Gremlin has various tokens (e.g. `T`, `P`, `Order`, `Operator`, etc.) that are r
These can be used analogously to how they are used in Gremlin-Java.
[source,csharp]
-g.V().HasLabel("person").Has("age",P.Gt(30)).Order().By("age",Order.decr).ToList()
+g.V().HasLabel("person").Has("age",P.Gt(30)).Order().By("age",Order.desc).ToList()
Moreover, the class prefixes can be omitted with a `using static`.
@@ -386,7 +386,7 @@ using static Gremlin.Net.Process.Traversal.Order;
Then it is possible to represent the above traversal as below.
[source,csharp]
-g.V().HasLabel("person").Has("age",Gt(30)).Order().By("age",decr).ToList()
+g.V().HasLabel("person").Has("age",Gt(30)).Order().By("age",desc).ToList()
Finally, with using static `__`, anonymous traversals like `__.Out()` can be expressed as below. That is, without the `__.`-prefix.
@@ -532,7 +532,7 @@ Gremlin has various tokens (e.g. `t`, `P`, `order`, `direction`, etc.) that are
objects.
[source,javascript]
-g.V().hasLabel('person').has('age', P.gt(30)).order().by('age', order.decr).toList()
+g.V().hasLabel('person').has('age', P.gt(30)).order().by('age', order.desc).toList()
These objects must be required manually from the `process` namespace:
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-graph.asciidoc b/docs/src/reference/the-graph.asciidoc
index 791c342..7769408 100644
--- a/docs/src/reference/the-graph.asciidoc
+++ b/docs/src/reference/the-graph.asciidoc
@@ -133,7 +133,7 @@ g.V().as('a').
hasNot('endTime').as('c').
select('a','b','c').by('name').by(value).by('startTime') // determine the current location of each person
g.V().has('name','gremlin').inE('uses').
- order().by('skill',incr).as('a').
+ order().by('skill',asc).as('a').
outV().as('b').
select('a','b').by('skill').by('name') // rank the users of gremlin by their skill level
----
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 3e162a4..89a0500 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -1147,10 +1147,10 @@ Note that the examples below use the <<the-crew-toy-graph,The Crew>> toy data se
[gremlin-groovy,theCrew]
----
g.V().as('person').
- properties('location').order().by('startTime',incr).limit(2).value().as('location').
+ properties('location').order().by('startTime',asc).limit(2).value().as('location').
select('person','location').by('name').by() <1>
g.V().as('person').
- local(properties('location').order().by('startTime',incr).limit(2)).value().as('location').
+ local(properties('location').order().by('startTime',asc).limit(2)).value().as('location').
select('person','location').by('name').by() <2>
----
@@ -1626,8 +1626,8 @@ When the objects of the traversal stream need to be sorted, `order()`-step (*map
[gremlin-groovy,modern]
----
g.V().values('name').order()
-g.V().values('name').order().by(decr)
-g.V().hasLabel('person').order().by('age', incr).values('name')
+g.V().values('name').order().by(desc)
+g.V().hasLabel('person').order().by('age', asc).values('name')
----
One of the most traversed objects in a traversal is an `Element`. An element can have properties associated with it
@@ -1637,8 +1637,8 @@ comparison of their properties.
[gremlin-groovy,modern]
----
g.V().values('name')
-g.V().order().by('name',incr).values('name')
-g.V().order().by('name',decr).values('name')
+g.V().order().by('name',asc).values('name')
+g.V().order().by('name',desc).values('name')
----
The `order()`-step allows the user to provide an arbitrary number of comparators for primary, secondary, etc. sorting.
@@ -1647,10 +1647,10 @@ based on the age of the person.
[gremlin-groovy,modern]
----
-g.V().hasLabel('person').order().by(outE('created').count(), incr).
- by('age', incr).values('name')
-g.V().hasLabel('person').order().by(outE('created').count(), incr).
- by('age', decr).values('name')
+g.V().hasLabel('person').order().by(outE('created').count(), asc).
+ by('age', asc).values('name')
+g.V().hasLabel('person').order().by(outE('created').count(), asc).
+ by('age', desc).values('name')
----
Randomizing the order of the traversers at a particular point in the traversal is possible with `Order.shuffle`.
@@ -1666,10 +1666,10 @@ It is possible to use `order(local)` to order the current local object and not t
[gremlin-groovy,modern]
----
-g.V().values('age').fold().order(local).by(decr) <1>
-g.V().values('age').order(local).by(decr) <2>
-g.V().groupCount().by(inE().count()).order(local).by(values, decr) <3>
-g.V().groupCount().by(inE().count()).order(local).by(keys, incr) <4>
+g.V().values('age').fold().order(local).by(desc) <1>
+g.V().values('age').order(local).by(desc) <2>
+g.V().groupCount().by(inE().count()).order(local).by(values, desc) <3>
+g.V().groupCount().by(inE().count()).order(local).by(keys, asc) <4>
----
<1> The ages are gathered into a list and then that list is sorted in decreasing order.
@@ -1679,11 +1679,16 @@ g.V().groupCount().by(inE().count()).order(local).by(keys, incr) <4>
NOTE: The `values` and `keys` enums are from `Column` which is used to select "columns" from a `Map`, `Map.Entry`, or `Path`.
+NOTE: Prior to version 3.3.4, ordering was defined by `Order.incr` for ascending order and `Order.decr` for descending
+order. That approach is now deprecated with the preferred method shown in the examples which uses the more common
+forms for query languages in `Order.asc` and Order.desc.
+
*Additional References*
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#order--++[`order()`],
link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.html#order-org.apache.tinkerpop.gremlin.process.traversal.Scope-++[`order(Scope)`],
-link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Scope.html++[`Scope`]
+link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Scope.html++[`Scope`],
+link:++http://tinkerpop.apache.org/javadocs/x.y.z/core/org/apache/tinkerpop/gremlin/process/traversal/Order.html++[`Order`]
[[pagerank-step]]
=== PageRank Step
@@ -1700,7 +1705,7 @@ g.V().hasLabel('person').
pageRank().
by(outE('knows')).
by('friendRank').
- order().by('friendRank',decr).valueMap('name','friendRank')
+ order().by('friendRank',desc).valueMap('name','friendRank')
----
The <<explain-step,`explain()`>>-step can be used to understand how the traversal is compiled into multiple `GraphComputer` jobs.
@@ -1712,7 +1717,7 @@ g.V().hasLabel('person').
pageRank().
by(outE('knows')).
by('friendRank').
- order().by('friendRank',decr).valueMap('name','friendRank').explain()
+ order().by('friendRank',desc).valueMap('name','friendRank').explain()
----
*Additional References*
@@ -1871,7 +1876,7 @@ g.V().out('created').
project('a','b').
by('name').
by(__.in('created').count()).
- order().by(select('b'),decr).
+ order().by(select('b'),desc).
select('a')
g.V().has('name','marko').
project('out','in').
@@ -1974,7 +1979,7 @@ Finally, an example is provided using `PageRankVertexProgram` which doesn't use
g = graph.traversal().withComputer()
g.V().hasLabel('person').
program(PageRankVertexProgram.build().property('rank').create(graph)).
- order().by('rank', incr).
+ order().by('rank', asc).
valueMap('name', 'rank')
----
@@ -2304,11 +2309,11 @@ ranking.
graph.io(graphml()).readGraph('data/grateful-dead.xml')
g = graph.traversal()
g.V().hasLabel('song').out('followedBy').groupCount().by('name').
- order(local).by(values,decr).limit(local, 5)
+ order(local).by(values,desc).limit(local, 5)
g.V().hasLabel('song').out('followedBy').groupCount().by('name').
- order(local).by(values,decr).limit(local, 5).select(keys)
+ order(local).by(values,desc).limit(local, 5).select(keys)
g.V().hasLabel('song').out('followedBy').groupCount().by('name').
- order(local).by(values,decr).limit(local, 5).select(keys).unfold()
+ order(local).by(values,desc).limit(local, 5).select(keys).unfold()
----
Similarly, for extracting the values from a path or map.
@@ -2320,7 +2325,7 @@ g = graph.traversal()
g.V().hasLabel('song').out('sungBy').groupCount().by('name') <1>
g.V().hasLabel('song').out('sungBy').groupCount().by('name').select(values) <2>
g.V().hasLabel('song').out('sungBy').groupCount().by('name').select(values).unfold().
- groupCount().order(local).by(values,decr).limit(local, 5) <3>
+ groupCount().order(local).by(values,desc).limit(local, 5) <3>
----
<1> Which artist sung how many songs?
@@ -2632,10 +2637,10 @@ that can be used to time execution of a body of code.
[gremlin-groovy,modern]
----
-g.V().repeat(both().groupCount('m')).times(16).cap('m').order(local).by(values,decr).next()
-clock(1) {g.V().repeat(both().groupCount('m')).times(16).cap('m').order(local).by(values,decr).next()}
-g.V().repeat(timeLimit(2).both().groupCount('m')).times(16).cap('m').order(local).by(values,decr).next()
-clock(1) {g.V().repeat(timeLimit(2).both().groupCount('m')).times(16).cap('m').order(local).by(values,decr).next()}
+g.V().repeat(both().groupCount('m')).times(16).cap('m').order(local).by(values,desc).next()
+clock(1) {g.V().repeat(both().groupCount('m')).times(16).cap('m').order(local).by(values,desc).next()}
+g.V().repeat(timeLimit(2).both().groupCount('m')).times(16).cap('m').order(local).by(values,desc).next()
+clock(1) {g.V().repeat(timeLimit(2).both().groupCount('m')).times(16).cap('m').order(local).by(values,desc).next()}
----
In essence, the relative order is respected, even through the number of traversers at each vertex is not. The primary
@@ -3087,7 +3092,7 @@ A few more examples of the use of `Scope` are provided below:
----
g.V().both().group().by(label).select('software').dedup(local)
g.V().groupCount().by(label).select(values).min(local)
-g.V().groupCount().by(label).order(local).by(values,decr)
+g.V().groupCount().by(label).order(local).by(values,desc)
g.V().fold().sample(local,2)
----
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/tutorials/gremlin-language-variants/index.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/tutorials/gremlin-language-variants/index.asciidoc b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
index db1a8f9..ebc988f 100644
--- a/docs/src/tutorials/gremlin-language-variants/index.asciidoc
+++ b/docs/src/tutorials/gremlin-language-variants/index.asciidoc
@@ -49,7 +49,7 @@ public class MyApplication {
// assumes that args[1] and args[2] are range boundaries
Iterator<Map<String,Double>> result =
g.V().hasLabel("product").
- order().by("unitPrice", incr).
+ order().by("unitPrice", asc).
range(Integer.valueOf(args[1]), Integer.valueOf(args[2])).
valueMap("name", "unitPrice")
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index ea2e159..d0f3a23 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -27,6 +27,16 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
Please see the link:https://github.com/apache/tinkerpop/blob/3.3.4/CHANGELOG.asciidoc#release-3-3-4[changelog] for a complete list of all the modifications that are part of this release.
+=== Upgrading for Users
+
+==== Introducing Order.asc and Order.desc
+
+The `Order` enum originally introduced `incr` for ascending order and `decr` for descending order. It's not clear why
+they were named this way when common querying parlance would call for `asc` and `desc` for those respective cases. Note
+that `incr` and `decr` have not been removed - just deprecated and thus marked for future removal. Prefer `asc` and
+`desc` going forward when writing Gremlin and look to update existing code using the deprecated values.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1956[TINKERPOP-1956]
== TinkerPop 3.3.3
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 0b88bba..9e89479 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@ -35,6 +35,7 @@ public enum Order implements Comparator<Object> {
* Order in ascending fashion
*
* @since 3.0.0-incubating
+ * @deprecated As of release 3.3.4, replaced by {@link #asc}.
*/
incr {
@Override
@@ -54,6 +55,7 @@ public enum Order implements Comparator<Object> {
* Order in descending fashion.
*
* @since 3.0.0-incubating
+ * @deprecated As of release 3.3.4, replaced by {@link #desc}.
*/
decr {
@Override
@@ -84,6 +86,44 @@ public enum Order implements Comparator<Object> {
public Order reversed() {
return shuffle;
}
+ },
+
+ /**
+ * Order in ascending fashion
+ *
+ * @since 3.3.4
+ */
+ asc {
+ @Override
+ public int compare(final Object first, final Object second) {
+ return first instanceof Number && second instanceof Number
+ ? NumberHelper.compare((Number) first, (Number) second)
+ : Comparator.<Comparable>naturalOrder().compare((Comparable) first, (Comparable) second);
+ }
+
+ @Override
+ public Order reversed() {
+ return decr;
+ }
+ },
+
+ /**
+ * Order in descending fashion.
+ *
+ * @since 3.3.4
+ */
+ desc {
+ @Override
+ public int compare(final Object first, final Object second) {
+ return first instanceof Number && second instanceof Number
+ ? NumberHelper.compare((Number) second, (Number) first)
+ : Comparator.<Comparable>reverseOrder().compare((Comparable) first, (Comparable) second);
+ }
+
+ @Override
+ public Order reversed() {
+ return incr;
+ }
};
private static final Random RANDOM = new Random();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
index fa705f4..fa80e97 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
@@ -90,7 +90,7 @@ public final class OrderGlobalStep<S, C extends Comparable> extends CollectingBa
@Override
public void modulateBy(final Traversal.Admin<?, ?> traversal) {
- this.modulateBy(traversal, Order.incr);
+ this.modulateBy(traversal, Order.asc);
}
@Override
@@ -100,7 +100,7 @@ public final class OrderGlobalStep<S, C extends Comparable> extends CollectingBa
@Override
public List<Pair<Traversal.Admin<S, C>, Comparator<C>>> getComparators() {
- return this.comparators.isEmpty() ? Collections.singletonList(new Pair<>(new IdentityTraversal(), (Comparator) Order.incr)) : Collections.unmodifiableList(this.comparators);
+ return this.comparators.isEmpty() ? Collections.singletonList(new Pair<>(new IdentityTraversal(), (Comparator) Order.asc)) : Collections.unmodifiableList(this.comparators);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
index 56f3404..95cb6db 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStep.java
@@ -72,7 +72,7 @@ public final class OrderLocalStep<S, C extends Comparable> extends MapStep<S, S>
@Override
public void modulateBy(final Traversal.Admin<?, ?> traversal) {
- this.addComparator((Traversal.Admin<S, C>) traversal, (Comparator) Order.incr);
+ this.addComparator((Traversal.Admin<S, C>) traversal, (Comparator) Order.asc);
}
@Override
@@ -82,7 +82,7 @@ public final class OrderLocalStep<S, C extends Comparable> extends MapStep<S, S>
@Override
public List<Pair<Traversal.Admin<S, C>, Comparator<C>>> getComparators() {
- return this.comparators.isEmpty() ? Collections.singletonList(new Pair<>(new IdentityTraversal(), (Comparator) Order.incr)) : Collections.unmodifiableList(this.comparators);
+ return this.comparators.isEmpty() ? Collections.singletonList(new Pair<>(new IdentityTraversal(), (Comparator) Order.asc)) : Collections.unmodifiableList(this.comparators);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ChainedComparator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ChainedComparator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ChainedComparator.java
index bdb2e6d..984767f 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ChainedComparator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/ChainedComparator.java
@@ -43,7 +43,7 @@ public final class ChainedComparator<S, C extends Comparable> implements Compara
public ChainedComparator(final boolean traversers, final List<Pair<Traversal.Admin<S, C>, Comparator<C>>> comparators) {
this.traversers = traversers;
if (comparators.isEmpty())
- this.comparators.add(new Pair<>(new IdentityTraversal(), (Comparator) Order.incr));
+ this.comparators.add(new Pair<>(new IdentityTraversal(), (Comparator) Order.asc));
else
this.comparators.addAll(comparators);
this.isShuffle = (Comparator) (this.comparators.get(this.comparators.size() - 1).getValue1()) == Order.shuffle;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MultiComparator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MultiComparator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MultiComparator.java
index d97d147..3adf1b8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MultiComparator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/util/function/MultiComparator.java
@@ -51,7 +51,7 @@ public final class MultiComparator<C> implements Comparator<C>, Serializable {
@Override
public int compare(final C objectA, final C objectB) {
if (this.comparators.isEmpty()) {
- return Order.incr.compare(objectA, objectB);
+ return Order.asc.compare(objectA, objectB);
} else {
for (int i = this.startIndex; i < this.comparators.size(); i++) {
final int comparison = this.comparators.get(i).compare(this.getObject(objectA, i), this.getObject(objectB, i));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java
index 7b1d810..1512d53 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/BytecodeTest.java
@@ -44,9 +44,9 @@ public class BytecodeTest {
@Test
public void shouldHaveProperHashAndEquality() {
final GraphTraversalSource g = EmptyGraph.instance().traversal();
- final Traversal.Admin traversal1 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.keys).order().by(Order.decr).asAdmin();
- final Traversal.Admin traversal2 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.keys).order().by(Order.decr).asAdmin();
- final Traversal.Admin traversal3 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.values).order().by(Order.decr).asAdmin();
+ final Traversal.Admin traversal1 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.keys).order().by(Order.desc).asAdmin();
+ final Traversal.Admin traversal2 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.keys).order().by(Order.desc).asAdmin();
+ final Traversal.Admin traversal3 = g.V().out().repeat(__.out().in()).times(2).groupCount().by(__.outE().count()).select(Column.values).order().by(Order.desc).asAdmin();
assertEquals(traversal1, traversal2);
assertNotEquals(traversal1, traversal3);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
index 01d93ea..a8124c6 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/OrderTest.java
@@ -42,6 +42,21 @@ public class OrderTest {
@Parameterized.Parameters(name = "{0}.test({1},{2})")
public static Iterable<Object[]> data() throws ParseException {
return new ArrayList<>(Arrays.asList(new Object[][]{
+ {Order.asc, Arrays.asList("b", "a", "c", "d"), Arrays.asList("a", "b", "c", "d")},
+ {Order.desc, Arrays.asList("b", "a", "c", "d"), Arrays.asList("d", "c", "b", "a")},
+ {Order.asc, Arrays.asList(formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2008")),
+ Arrays.asList(formatter.parse("1-Jan-2008"), formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"))},
+ {Order.desc, Arrays.asList(formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2008")),
+ Arrays.asList(formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2008"))},
+ {Order.desc, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(100L, 1L, 0L, -1L)},
+ {Order.asc, Arrays.asList(100.1f, 1.1f, -1.1f, 0.1f), Arrays.asList(-1.1f, 0.1f, 1.1f, 100.1f)},
+ {Order.desc, Arrays.asList(100.1f, 1.1f, -1.1f, 0.1f), Arrays.asList(100.1f, 1.1f, 0.1f, -1.1f)},
+ {Order.asc, Arrays.asList(100.1d, 1.1d, -1.1d, 0.1d), Arrays.asList(-1.1d, 0.1d, 1.1d, 100.1d)},
+ {Order.desc, Arrays.asList(100.1d, 1.1d, -1.1d, 0.1d), Arrays.asList(100.1d, 1.1d, 0.1d, -1.1d)},
+ {Order.asc, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(-1L, 0L, 1L, 100L)},
+ {Order.desc, Arrays.asList(100L, 1L, -1L, 0L), Arrays.asList(100L, 1L, 0L, -1L)},
+ {Order.asc, Arrays.asList(100, 1, -1, 0), Arrays.asList(-1, 0, 1, 100)},
+ {Order.desc, Arrays.asList(100, 1, -1, 0), Arrays.asList(100, 1, 0, -1)},
{Order.incr, Arrays.asList("b", "a", "c", "d"), Arrays.asList("a", "b", "c", "d")},
{Order.decr, Arrays.asList("b", "a", "c", "d"), Arrays.asList("d", "c", "b", "a")},
{Order.incr, Arrays.asList(formatter.parse("1-Jan-2018"), formatter.parse("1-Jan-2020"), formatter.parse("1-Jan-2008")),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java
index 82acad3..31457fc 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStepTest.java
@@ -45,7 +45,13 @@ public class OrderGlobalStepTest extends StepTest {
__.order().by("age", Order.decr),
__.order().by(outE().count(), Order.incr),
__.order().by("age", Order.incr).by(outE().count(), Order.incr),
- __.order().by(outE().count(), Order.incr).by("age", Order.incr)
+ __.order().by(outE().count(), Order.incr).by("age", Order.incr),
+ __.order().by(Order.desc),
+ __.order().by("age", Order.asc),
+ __.order().by("age", Order.desc),
+ __.order().by(outE().count(), Order.asc),
+ __.order().by("age", Order.asc).by(outE().count(), Order.asc),
+ __.order().by(outE().count(), Order.asc).by("age", Order.asc)
);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java
index 8cc2e7e..5999793 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderLocalStepTest.java
@@ -47,7 +47,13 @@ public class OrderLocalStepTest extends StepTest {
__.order(Scope.local).by("age", Order.decr),
__.order(Scope.local).by(outE().count(), Order.incr),
__.order(Scope.local).by("age", Order.incr).by(outE().count(), Order.incr),
- __.order(Scope.local).by(outE().count(), Order.incr).by("age", Order.incr)
+ __.order(Scope.local).by(outE().count(), Order.incr).by("age", Order.incr),
+ __.order(Scope.local).by(Order.desc),
+ __.order(Scope.local).by("age", Order.asc),
+ __.order(Scope.local).by("age", Order.desc),
+ __.order(Scope.local).by(outE().count(), Order.asc),
+ __.order(Scope.local).by("age", Order.asc).by(outE().count(), Order.asc),
+ __.order(Scope.local).by(outE().count(), Order.asc).by("age", Order.asc)
);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
index 240ff1a..0669b08 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java
@@ -201,7 +201,7 @@ public class PathRetractionStrategyTest {
{__.V().select("a").map(select("b").repeat(select("c"))).select("a"),
"[[a, b, c], [[a, c], [[a, c]]], []]", null},
{__.V().out("created").project("a", "b").by("name").by(__.in("created").count()).order().by(select("b")).select("a"), "[[[a]], []]", null},
- {__.order().by("weight", Order.decr).store("w").by("weight").filter(values("weight").as("cw").
+ {__.order().by("weight", Order.desc).store("w").by("weight").filter(values("weight").as("cw").
select("w").by(limit(Scope.local, 1)).as("mw").where("cw", eq("mw"))).project("from", "to", "weight").by(__.outV()).by(__.inV()).by("weight"),
"[[[cw, mw], []]]", null},
{__.V().limit(1).as("z").out().repeat(store("seen").out().where(without("seen"))).until(where(eq("z"))),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
index b79d2c9..06309ea 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/LambdaRestrictionStrategyTest.java
@@ -63,9 +63,9 @@ public class LambdaRestrictionStrategyTest {
{"order().by((a,b)->a.compareTo(b))", __.order().by((a, b) -> ((Integer) a).compareTo((Integer) b)), false},
{"order(local).by((a,b)->a.compareTo(b))", __.order(Scope.local).by((a, b) -> ((Integer) a).compareTo((Integer) b)), false},
{"__.choose(v->v.toString().equals(\"marko\"),__.out(),__.in())", __.choose(v -> v.toString().equals("marko"), __.out(), __.in()), false},
- {"order().by(label,decr)", __.order().by(T.label, Order.decr), true},
+ {"order().by(label,desc)", __.order().by(T.label, Order.desc), true},
{"order(local).by(values)", __.order(Scope.local).by(values), true},
- {"order(local).by(values,decr)", __.order(Scope.local).by(values,Order.decr), true},
+ {"order(local).by(values,desc)", __.order(Scope.local).by(values,Order.desc), true},
{"order(local).by(values,(a,b) -> a.compareTo(b))", __.order(Scope.local).by(values, (a, b) -> ((Double) a).compareTo((Double) b)), false},
//
{"groupCount().by(label)", __.groupCount().by(T.label), true},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/function/MultiComparatorTest.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/function/MultiComparatorTest.java b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/function/MultiComparatorTest.java
index de2a741..83520be 100644
--- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/function/MultiComparatorTest.java
+++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/util/function/MultiComparatorTest.java
@@ -39,20 +39,20 @@ public class MultiComparatorTest {
@Test
public void shouldHandleShuffleCorrectly() {
- MultiComparator<Object> comparator = new MultiComparator<>(Arrays.asList(Order.incr, Order.decr, Order.shuffle));
+ MultiComparator<Object> comparator = new MultiComparator<>(Arrays.asList(Order.asc, Order.desc, Order.shuffle));
assertTrue(comparator.isShuffle()); // because its a shuffle, the comparator simply returns 0
for (int i = 0; i < 100; i++) {
assertEquals(0, comparator.compare(RANDOM.nextInt(), RANDOM.nextInt()));
}
//
- comparator = new MultiComparator<>(Arrays.asList(Order.incr, Order.shuffle, Order.decr));
+ comparator = new MultiComparator<>(Arrays.asList(Order.asc, Order.shuffle, Order.desc));
assertEquals(1, comparator.compare(1, 2));
assertEquals(-1, comparator.compare(2, 1));
assertEquals(0, comparator.compare(2, 2));
assertEquals(2, comparator.startIndex);
assertFalse(comparator.isShuffle());
//
- comparator = new MultiComparator<>(Arrays.asList(Order.incr, Order.shuffle, Order.decr, Order.shuffle, Order.incr));
+ comparator = new MultiComparator<>(Arrays.asList(Order.asc, Order.shuffle, Order.desc, Order.shuffle, Order.asc));
assertEquals(-1, comparator.compare(1, 2));
assertEquals(1, comparator.compare(2, 1));
assertEquals(0, comparator.compare(2, 2));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
index 585c4f0..eadaa0e 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/NamingConversions.cs
@@ -72,6 +72,8 @@ namespace Gremlin.Net.Process.Traversal
{"Order.Decr", "decr"},
{"Order.Incr", "incr"},
{"Order.Shuffle", "shuffle"},
+ {"Order.Asc", "asc"},
+ {"Order.Desc", "desc"},
{"Pick.Any", "any"},
{"Pick.None", "none"},
{"Pop.All", "all"},
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
index 2430114..9fce332 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
+++ b/gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Order.cs
@@ -36,15 +36,21 @@ namespace Gremlin.Net.Process.Traversal
{
}
+ public static Order Asc => new Order("asc");
+
public static Order Decr => new Order("decr");
+ public static Order Desc => new Order("desc");
+
public static Order Incr => new Order("incr");
public static Order Shuffle => new Order("shuffle");
private static readonly IDictionary<string, Order> Properties = new Dictionary<string, Order>
{
+ { "asc", Asc },
{ "decr", Decr },
+ { "desc", Desc },
{ "incr", Incr },
{ "shuffle", Shuffle },
};
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/EnumTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/EnumTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/EnumTests.cs
index 00541ad..b849769 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/EnumTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Process/Traversal/DriverRemoteConnection/EnumTests.cs
@@ -39,7 +39,7 @@ namespace Gremlin.Net.IntegrationTest.Process.Traversal.DriverRemoteConnection
var connection = _connectionFactory.CreateRemoteConnection();
var g = graph.Traversal().WithRemote(connection);
- var orderedAges = g.V().Values<int>("age").Order().By(Order.Decr).ToList();
+ var orderedAges = g.V().Values<int>("age").Order().By(Order.Desc).ToList();
Assert.Equal(new List<int> {35, 32, 29, 27}, orderedAges);
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
index b214d8d..d39ccf0 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/process/traversal.js
@@ -260,7 +260,7 @@ module.exports = {
graphSONVersion: toEnum('GraphSONVersion', 'V1_0 V2_0 V3_0'),
gryoVersion: toEnum('GryoVersion', 'V1_0 V3_0'),
operator: toEnum('Operator', 'addAll and assign div max min minus mult or sum sumLong'),
- order: toEnum('Order', 'decr incr shuffle'),
+ order: toEnum('Order', 'asc decr desc incr shuffle'),
pick: toEnum('Pick', 'any none'),
pop: toEnum('Pop', 'all first last mixed'),
scope: toEnum('Scope', 'global local'),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js
index 130a218..233488a 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/traversal-test.js
@@ -44,7 +44,7 @@ describe('Traversal', function () {
it('should add steps with an enum value', function () {
const g = new graph.Graph().traversal();
- const bytecode = g.V().order().by('age', t.order.decr).getBytecode();
+ const bytecode = g.V().order().by('age', t.order.desc).getBytecode();
assert.ok(bytecode);
assert.strictEqual(bytecode.sourceInstructions.length, 0);
assert.strictEqual(bytecode.stepInstructions.length, 3);
@@ -54,7 +54,7 @@ describe('Traversal', function () {
assert.strictEqual(bytecode.stepInstructions[2][1], 'age');
assert.strictEqual(typeof bytecode.stepInstructions[2][2], 'object');
assert.strictEqual(bytecode.stepInstructions[2][2].typeName, 'Order');
- assert.strictEqual(bytecode.stepInstructions[2][2].elementName, 'decr');
+ assert.strictEqual(bytecode.stepInstructions[2][2].elementName, 'desc');
});
});
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
----------------------------------------------------------------------
diff --git a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
index a820838..068c865 100644
--- a/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
+++ b/gremlin-python/src/main/jython/gremlin_python/process/traversal.py
@@ -148,11 +148,13 @@ statics.add_static('or_', Operator.or_)
statics.add_static('addAll', Operator.addAll)
statics.add_static('sumLong', Operator.sumLong)
-Order = Enum('Order', ' decr incr shuffle')
+Order = Enum('Order', ' asc decr desc incr shuffle')
statics.add_static('incr', Order.incr)
statics.add_static('decr', Order.decr)
statics.add_static('shuffle', Order.shuffle)
+statics.add_static('asc', Order.asc)
+statics.add_static('desc', Order.desc)
Pick = Enum('Pick', ' any none')
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/features/branch/Local.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/branch/Local.feature b/gremlin-test/features/branch/Local.feature
index 0abb1eb..3b7ab98 100644
--- a/gremlin-test/features/branch/Local.feature
+++ b/gremlin-test/features/branch/Local.feature
@@ -21,7 +21,7 @@ Feature: Step - local()
Given the crew graph
And the traversal of
"""
- g.V().local(__.properties("location").order().by(T.value, Order.incr).range(0, 2)).value()
+ g.V().local(__.properties("location").order().by(T.value, Order.asc).range(0, 2)).value()
"""
When iterated to list
Then the result should be unordered
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/features/filter/Dedup.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/filter/Dedup.feature b/gremlin-test/features/filter/Dedup.feature
index c502c96..501d02b 100644
--- a/gremlin-test/features/filter/Dedup.feature
+++ b/gremlin-test/features/filter/Dedup.feature
@@ -169,11 +169,11 @@ Feature: Step - dedup()
| p[v[josh],v[lop],v[marko]] |
| p[v[peter],v[lop],v[marko]] |
- Scenario: g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_incrX_selectXvX_valuesXnameX_dedup
+ Scenario: g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_ascX_selectXvX_valuesXnameX_dedup
Given the modern graph
And the traversal of
"""
- g.V().outE().as("e").inV().as("v").select("e").order().by("weight", Order.incr).select("v").values("name").dedup()
+ g.V().outE().as("e").inV().as("v").select("e").order().by("weight", Order.asc).select("v").values("name").dedup()
"""
When iterated to list
Then the result should be unordered
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/features/map/AddEdge.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/AddEdge.feature b/gremlin-test/features/map/AddEdge.feature
index 69c24c2..028dceb 100644
--- a/gremlin-test/features/map/AddEdge.feature
+++ b/gremlin-test/features/map/AddEdge.feature
@@ -336,7 +336,7 @@ Feature: Step - addE()
And the graph should return 1 for count of "g.V(v1).in(\"created\").has(\"name\",\"lop\")"
And the graph should return 1 for count of "g.V(v1).outE(\"created\")"
- Scenario: g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_decrX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX
+ Scenario: g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_descX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX
Given the empty graph
And the graph initializer of
"""
@@ -356,7 +356,7 @@ Feature: Step - addE()
And using the parameter v2 defined as "v[vadas]"
And the traversal of
"""
- g.addE(__.V().outE().label().groupCount().order(Scope.local).by(Column.values, Order.decr).select(Column.keys).unfold().limit(1)).from(__.V().has("name", "vadas")).to(__.V().has("name", "lop"))
+ g.addE(__.V().outE().label().groupCount().order(Scope.local).by(Column.values, Order.desc).select(Column.keys).unfold().limit(1)).from(__.V().has("name", "vadas")).to(__.V().has("name", "lop"))
"""
When iterated to list
Then the result should have a count of 1
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/features/map/Match.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Match.feature b/gremlin-test/features/map/Match.feature
index 55dffcf..c019cd0 100644
--- a/gremlin-test/features/map/Match.feature
+++ b/gremlin-test/features/map/Match.feature
@@ -320,11 +320,11 @@ Feature: Step - match()
| m[{"a":"v[josh]","b":"v[lop]"}] |
| m[{"a":"v[peter]","b":"v[lop]"}] |
- Scenario: g_V_matchXa_outEXcreatedX_order_byXweight_decrX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX
+ Scenario: g_V_matchXa_outEXcreatedX_order_byXweight_descX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX
Given the modern graph
And the traversal of
"""
- g.V().match(__.as("a").outE("created").order().by("weight", Order.decr).limit(1).inV().as("b"),
+ g.V().match(__.as("a").outE("created").order().by("weight", Order.desc).limit(1).inV().as("b"),
__.as("b").has("lang", "java")).select("a", "b").by("name")
"""
When iterated to list
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/features/map/Order.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Order.feature b/gremlin-test/features/map/Order.feature
index 33ae97a..f361878 100644
--- a/gremlin-test/features/map/Order.feature
+++ b/gremlin-test/features/map/Order.feature
@@ -67,6 +67,22 @@ Feature: Step - order()
| ripple |
| vadas |
+ Scenario: g_V_order_byXname_ascX_name
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().order().by("name", Order.asc).values("name")
+ """
+ When iterated to list
+ Then the result should be ordered
+ | result |
+ | josh |
+ | lop |
+ | marko |
+ | peter |
+ | ripple |
+ | vadas |
+
Scenario: g_V_order_byXnameX_name
Given the modern graph
And the traversal of
@@ -99,6 +115,22 @@ Feature: Step - order()
| d[0.4].d |
| d[0.2].d |
+ Scenario: g_V_outE_order_byXweight_descX_weight
+ Given the modern graph
+ And the traversal of
+ """
+ g.V().outE().order().by("weight", Order.desc).values("weight")
+ """
+ When iterated to list
+ Then the result should be ordered
+ | result |
+ | d[1.0].d |
+ | d[1.0].d |
+ | d[0.5].d |
+ | d[0.4].d |
+ | d[0.4].d |
+ | d[0.2].d |
+
Scenario: g_V_order_byXname_a1_b1X_byXname_b2_a2X_name
Given the modern graph
And using the parameter l1 defined as "c[a, b -> a.substring(1, 2).compareTo(b.substring(1, 2))]"
@@ -131,11 +163,11 @@ Feature: Step - order()
| m[{"a":"v[josh]","b":"v[ripple]"}] |
| m[{"a":"v[josh]","b":"v[lop]"}] |
- Scenario: g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name
+ Scenario: g_V_both_hasLabelXpersonX_order_byXage_descX_limitX5X_name
Given the modern graph
And the traversal of
"""
- g.V().both().hasLabel("person").order().by("age", Order.decr).limit(5).values("name")
+ g.V().both().hasLabel("person").order().by("age", Order.desc).limit(5).values("name")
"""
When iterated to list
Then the result should be ordered
@@ -146,11 +178,11 @@ Feature: Step - order()
| josh |
| marko |
- Scenario: g_V_properties_order_byXkey_decrX_key
+ Scenario: g_V_properties_order_byXkey_descX_key
Given the modern graph
And the traversal of
"""
- g.V().properties().order().by(T.key, Order.decr).key()
+ g.V().properties().order().by(T.key, Order.desc).key()
"""
When iterated to list
Then the result should be ordered
@@ -168,12 +200,12 @@ Feature: Step - order()
| age |
| age |
- Scenario: g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name
+ Scenario: g_V_hasLabelXpersonX_order_byXvalueXageX_descX_name
Given the modern graph
And using the parameter l1 defined as "c[it.value('age')]"
And the traversal of
"""
- g.V().hasLabel("person").order().by(l1, Order.decr).values("name")
+ g.V().hasLabel("person").order().by(l1, Order.desc).values("name")
"""
When iterated to list
Then the result should be ordered
@@ -194,11 +226,11 @@ Feature: Step - order()
| result |
| m[{"vadas":"d[0].i","peter":"d[0.2].d","josh":"d[1.4].d","marko":"d[1.9].d"}] |
- Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX
+ Scenario: g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX
Given the modern graph
And the traversal of
"""
- g.V().local(__.bothE().values("weight").fold()).order().by(__.sum(Scope.local), Order.decr)
+ g.V().local(__.bothE().values("weight").fold()).order().by(__.sum(Scope.local), Order.desc)
"""
When iterated to list
Then the result should be ordered
@@ -210,22 +242,22 @@ Feature: Step - order()
| l[d[0.5].d] |
| l[d[0.2].d] |
- Scenario: g_V_group_byXlabelX_byXname_order_byXdecrX_foldX
+ Scenario: g_V_group_byXlabelX_byXname_order_byXdescX_foldX
Given the modern graph
And the traversal of
"""
- g.V().group().by(T.label).by(__.values("name").order().by(Order.decr).fold())
+ g.V().group().by(T.label).by(__.values("name").order().by(Order.desc).fold())
"""
When iterated to list
Then the result should be ordered
| result |
| m[{"software":"l[ripple,lop]","person":"l[vadas,peter,marko,josh]"}] |
- Scenario: g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX
+ Scenario: g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_descX
Given the modern graph
And the traversal of
"""
- g.V().hasLabel("person").group().by("name").by(__.outE().values("weight").sum()).unfold().order().by(Column.values, Order.decr)
+ g.V().hasLabel("person").group().by("name").by(__.outE().values("weight").sum()).unfold().order().by(Column.values, Order.desc)
"""
When iterated to list
Then the result should be ordered
@@ -235,11 +267,11 @@ Feature: Step - order()
| m[{"peter":"d[0.2].d"}] |
| m[{"vadas":"d[0].i"}] |
- Scenario: g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX
+ Scenario: g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_descX
Given the modern graph
And the traversal of
"""
- g.V().as("v").map(__.bothE().values("weight").fold()).sum(Scope.local).as("s").select("v", "s").order().by(__.select("s"), Order.decr)
+ g.V().as("v").map(__.bothE().values("weight").fold()).sum(Scope.local).as("s").select("v", "s").order().by(__.select("s"), Order.desc)
"""
When iterated to list
Then the result should be ordered
@@ -262,11 +294,11 @@ Feature: Step - order()
| result |
| l[v[vadas],v[marko],v[josh],v[peter]] |
- Scenario: g_V_both_hasLabelXpersonX_order_byXage_decrX_name
+ Scenario: g_V_both_hasLabelXpersonX_order_byXage_descX_name
Given the modern graph
And the traversal of
"""
- g.V().both().hasLabel("person").order().by("age", Order.decr).values("name")
+ g.V().both().hasLabel("person").order().by("age", Order.desc).values("name")
"""
When iterated to list
Then the result should be ordered
@@ -280,11 +312,11 @@ Feature: Step - order()
| marko |
| vadas |
- Scenario: g_V_order_byXoutE_count__decrX
+ Scenario: g_V_order_byXoutE_count_descX
Given the modern graph
And the traversal of
"""
- g.V().order().by(__.outE().count(), Order.decr)
+ g.V().order().by(__.outE().count(), Order.desc)
"""
When iterated to list
Then the result should be ordered
@@ -310,13 +342,13 @@ Feature: Step - order()
| v[josh] |
| v[peter] |
- Scenario: g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX
+ Scenario: g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_descX_byXkeys_ascX
Given the modern graph
And using the parameter v1 defined as "v[marko]"
And using the parameter l1 defined as "c[['1':it.get().value('age'),'2':it.get().value('age')*2,'3':it.get().value('age')*3,'4':it.get().value('age')]]"
And the traversal of
"""
- g.V(v1).hasLabel("person").map(l1).order(Scope.local).by(Column.values, Order.decr).by(Column.keys, Order.incr)
+ g.V(v1).hasLabel("person").map(l1).order(Scope.local).by(Column.values, Order.desc).by(Column.keys, Order.asc)
"""
When iterated to list
Then the result should be ordered
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/features/map/Project.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Project.feature b/gremlin-test/features/map/Project.feature
index cda2029..8974312 100644
--- a/gremlin-test/features/map/Project.feature
+++ b/gremlin-test/features/map/Project.feature
@@ -34,7 +34,7 @@ Feature: Step - project()
| m[{"a":"d[2].l", "b":"d[32].i"}] |
| m[{"a":"d[1].l", "b":"d[35].i"}] |
- Scenario: g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__decrX_selectXaX
+ Scenario: g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX
Given the modern graph
And the traversal of
"""
@@ -43,7 +43,7 @@ Feature: Step - project()
by("name").
by(__.in("created").count()).
order().
- by(__.select("b"), Order.decr).
+ by(__.select("b"), Order.desc).
select("a")
"""
When iterated to list
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/features/map/Select.feature
----------------------------------------------------------------------
diff --git a/gremlin-test/features/map/Select.feature b/gremlin-test/features/map/Select.feature
index 713dd81..341a378 100644
--- a/gremlin-test/features/map/Select.feature
+++ b/gremlin-test/features/map/Select.feature
@@ -125,13 +125,13 @@ Feature: Step - select()
| m[{"a": "lop", "b": "lop"}] |
| m[{"a": "peter", "b": "peter"}] |
- Scenario: g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX
+ Scenario: g_V_hasXname_gremlinX_inEXusesX_order_byXskill_ascX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX
Given the crew graph
And the traversal of
"""
g.V().has("name", "gremlin").
inE("uses").
- order().by("skill", Order.incr).as("a").
+ order().by("skill", Order.asc).as("a").
outV().as("b").
select("a", "b").
by("skill").
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
index 5c6a1e5..75dd0f5 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
@@ -256,8 +256,8 @@ public abstract class ComplexTest extends AbstractGremlinProcessTest {
by(select(keys).values("performances")).
by(select(values)).
order().
- by(select("z"), Order.decr).
- by(select("y"), Order.incr).
+ by(select("z"), Order.desc).
+ by(select("y"), Order.asc).
limit(5).store("m").select("x");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
index faec45e..6f70bb1 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
@@ -225,7 +225,7 @@ public abstract class LocalTest extends AbstractGremlinProcessTest {
@Override
public Traversal<Vertex, String> get_g_V_localXpropertiesXlocationX_order_byXvalueX_limitX2XX_value() {
- return g.V().local(properties("location").order().by(T.value, Order.incr).range(0, 2)).value();
+ return g.V().local(properties("location").order().by(T.value, Order.asc).range(0, 2)).value();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
index ef5086f..0877ddb 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
@@ -77,7 +77,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Path> get_g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_dedupXa_bX_path();
- public abstract Traversal<Vertex, String> get_g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_incrX_selectXvX_valuesXnameX_dedup();
+ public abstract Traversal<Vertex, String> get_g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_ascX_selectXvX_valuesXnameX_dedup();
public abstract Traversal<Vertex, String> get_g_V_both_both_dedup_byXoutE_countX_name();
@@ -253,8 +253,8 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_incrX_selectXvX_valuesXnameX_dedup() {
- final Traversal<Vertex, String> traversal = get_g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_incrX_selectXvX_valuesXnameX_dedup();
+ public void g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_ascX_selectXvX_valuesXnameX_dedup() {
+ final Traversal<Vertex, String> traversal = get_g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_ascX_selectXvX_valuesXnameX_dedup();
printTraversalForm(traversal);
final List<String> names = traversal.toList();
assertEquals(4, names.size());
@@ -370,8 +370,8 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_incrX_selectXvX_valuesXnameX_dedup() {
- return g.V().outE().as("e").inV().as("v").select("e").order().by("weight", Order.incr).select("v").<String>values("name").dedup();
+ public Traversal<Vertex, String> get_g_V_outE_asXeX_inV_asXvX_selectXeX_order_byXweight_ascX_selectXvX_valuesXnameX_dedup() {
+ return g.V().outE().as("e").inV().as("v").select("e").order().by("weight", Order.asc).select("v").<String>values("name").dedup();
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index d340297..54c4091 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
import java.util.Arrays;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.traversal.Order.decr;
+import static org.apache.tinkerpop.gremlin.process.traversal.Order.desc;
import static org.apache.tinkerpop.gremlin.process.traversal.Scope.local;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.V;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
@@ -74,7 +74,7 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Edge> get_g_V_hasXname_markoX_asXaX_outEXcreatedX_asXbX_inV_addEXselectXbX_labelX_toXaX();
- public abstract Traversal<Edge, Edge> get_g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_decrX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX();
+ public abstract Traversal<Edge, Edge> get_g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_descX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX();
///////
@@ -281,8 +281,8 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
@FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = Graph.Features.EdgeFeatures.FEATURE_ADD_EDGES)
- public void g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_decrX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX() {
- final Traversal<Edge, Edge> traversal = get_g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_decrX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX();
+ public void g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_descX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX() {
+ final Traversal<Edge, Edge> traversal = get_g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_descX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX();
printTraversalForm(traversal);
final Edge edge = traversal.next();
assertFalse(traversal.hasNext());
@@ -346,8 +346,8 @@ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Edge, Edge> get_g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_decrX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX() {
- return g.addE(V().outE().label().groupCount().order(local).by(values, decr).select(keys).<String>unfold().limit(1)).from(V().has("name", "vadas")).to(V().has("name", "lop"));
+ public Traversal<Edge, Edge> get_g_addEXV_outE_label_groupCount_orderXlocalX_byXvalues_descX_selectXkeysX_unfold_limitX1XX_fromXV_hasXname_vadasXX_toXV_hasXname_lopXX() {
+ return g.addE(V().outE().label().groupCount().order(local).by(values, desc).select(keys).<String>unfold().limit(1)).from(V().has("name", "vadas")).to(V().has("name", "lop"));
}
}
}
[08/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/153a01b0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/153a01b0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/153a01b0
Branch: refs/heads/TINKERPOP-1956
Commit: 153a01b0211df67fd11558fecfd9448b01eb3439
Parents: c7ece36 f64afe5
Author: Robert Dale <ro...@gmail.com>
Authored: Sun May 6 10:50:29 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sun May 6 10:50:29 2018 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/153a01b0/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
[19/50] [abbrv] tinkerpop git commit: Minor fix to formatting of
header in CHANGELOG CTR
Posted by sp...@apache.org.
Minor fix to formatting of header in CHANGELOG CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ac161fa8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ac161fa8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ac161fa8
Branch: refs/heads/TINKERPOP-1956
Commit: ac161fa8cd613f3a0052debd460e5c363777ce2e
Parents: cfbe2ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 11:57:12 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 10 11:57:12 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ac161fa8/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 18f36ed..62c412e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -2396,7 +2396,6 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory where jars are to be loaded.
* Updated README with release instructions.
-TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+=== TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
* First official release of TinkerPop3 and thus, no changes.
[22/50] [abbrv] tinkerpop git commit: Unify and clean up gmavenplus
plugin configurations for GLVs CTR
Posted by sp...@apache.org.
Unify and clean up gmavenplus plugin configurations for GLVs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8a03d50d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8a03d50d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8a03d50d
Branch: refs/heads/TINKERPOP-1956
Commit: 8a03d50dedf31e587fb60e0f7735036a1484cfd4
Parents: d995972
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 15:13:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:10:12 2018 -0400
----------------------------------------------------------------------
gremlin-dotnet/pom.xml | 5 ++---
gremlin-javascript/pom.xml | 45 ++++++++---------------------------------
gremlin-python/pom.xml | 4 ++--
pom.xml | 3 ++-
4 files changed, 14 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index fd2d428..fbc97d4 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -46,9 +46,8 @@ limitations under the License.
<dependencies>
<dependency>
<groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-core</artifactId>
+ <artifactId>gremlin-server</artifactId>
<version>${project.version}</version>
- <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
@@ -60,7 +59,7 @@ limitations under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 0fe6bf4..f91b749 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -25,36 +25,6 @@ limitations under the License.
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>tinkergraph-gremlin</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-test</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tinkerpop</groupId>
- <artifactId>gremlin-server</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
<properties>
<maven.test.skip>false</maven.test.skip>
<skipTests>${maven.test.skip}</skipTests>
@@ -81,21 +51,22 @@ limitations under the License.
<artifactId>gmavenplus-plugin</artifactId>
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-server</artifactId>
<version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-ant</artifactId>
+ <artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
+ <classifier>indy</classifier>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<executions>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index c999877..a2ab516 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -455,14 +455,14 @@ limitations under the License.
<dependency>
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
- <version>2.4.11</version>
+ <version>${groovy.version}</version>
<classifier>indy</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8a03d50d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6b24199..c724e0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -146,6 +146,7 @@ limitations under the License.
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>2.10.4</javadoc-plugin.version>
<jcabi.version>1.1</jcabi.version>
+ <log4j.version>1.2.17</log4j.version>
<metrics.version>3.0.2</metrics.version>
<netty.version>4.0.56.Final</netty.version>
<slf4j.version>1.7.21</slf4j.version>
@@ -659,7 +660,7 @@ limitations under the License.
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.17</version>
+ <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
[37/50] [abbrv] tinkerpop git commit: Removed some bad formatting in
reference docs CTR
Posted by sp...@apache.org.
Removed some bad formatting in reference docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3f94a27f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3f94a27f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3f94a27f
Branch: refs/heads/TINKERPOP-1956
Commit: 3f94a27f35840876787448d8a72a182a14e4d67c
Parents: 42e509c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 12:01:20 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 12:01:20 2018 -0400
----------------------------------------------------------------------
docs/src/reference/gremlin-applications.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3f94a27f/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index ace796f..c63228f 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -668,7 +668,7 @@ They are all still evaluated locally.
<version>x.y.z</version>
</dependency>
----
- gremlin-groovy
+
image:gremlin-java.png[width=175,float=left] TinkerPop3 comes equipped with a reference client for Java-based
applications. It is referred to as Gremlin Driver, which enables applications to send requests to Gremlin Server
and get back results.
[28/50] [abbrv] tinkerpop git commit: TINKERPOP-1961 Removed
duplication of images in binaries.
Posted by sp...@apache.org.
TINKERPOP-1961 Removed duplication of images in binaries.
The asciidoc plugin copies all files in the source directories of its execution. The asciidoc plugin was upgraded between 3.2.5 and 3.2.6 which introduced this new behavior.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/288b455a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/288b455a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/288b455a
Branch: refs/heads/TINKERPOP-1956
Commit: 288b455a731bbc2f062b2cfe043f8c775dee9700
Parents: 3635ff6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed May 9 07:03:13 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 20:03:31 2018 -0400
----------------------------------------------------------------------
pom.xml | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/288b455a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9737fef..9c4b507 100644
--- a/pom.xml
+++ b/pom.xml
@@ -811,9 +811,14 @@ limitations under the License.
<goal>process-asciidoc</goal>
</goals>
<configuration>
- <sourceDirectory>${asciidoc.input.dir}/</sourceDirectory>
+ <resources>
+ <resource>
+ <directory>${asciidoc.input.dir}/</directory>
+ <targetPath>${htmlsingle.output.dir}/</targetPath>
+ <excludes>${asciidoc.input.dir}/static/*.*</excludes>
+ </resource>
+ </resources>
<sourceDocumentName>index.asciidoc</sourceDocumentName>
- <outputDirectory>${htmlsingle.output.dir}/</outputDirectory>
<backend>html5</backend>
<doctype>article</doctype>
<attributes>
[40/50] [abbrv] tinkerpop git commit: CTR changelog entry for
TINKERPOP-1933
Posted by sp...@apache.org.
CTR changelog entry for TINKERPOP-1933
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/58d3d403
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/58d3d403
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/58d3d403
Branch: refs/heads/TINKERPOP-1956
Commit: 58d3d403f09d09651828fe216a58cc1e8c624797
Parents: fa3fb9e
Author: davebshow <da...@gmail.com>
Authored: Mon May 14 12:42:49 2018 -0700
Committer: davebshow <da...@gmail.com>
Committed: Mon May 14 12:42:49 2018 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/58d3d403/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 41d83c4..b407288 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,8 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
[[release-3-2-10]]
=== TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
+* Removed recursive handling of streaming results from Gremlin-Python driver to avoid max recursion depth errors.
+
[[release-3-2-9]]
=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
[39/50] [abbrv] tinkerpop git commit: merged tp32. fixed conflict
related to better message deserializer implementation in 3.3.x line
Posted by sp...@apache.org.
merged tp32. fixed conflict related to better message deserializer implementation in 3.3.x line
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/71587682
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/71587682
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/71587682
Branch: refs/heads/TINKERPOP-1956
Commit: 71587682236138de179137a233d243100178ee4f
Parents: 3f94a27 fa3fb9e
Author: davebshow <da...@gmail.com>
Authored: Mon May 14 12:15:37 2018 -0700
Committer: davebshow <da...@gmail.com>
Committed: Mon May 14 12:15:37 2018 -0700
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/driver/connection.py | 7 +++++--
.../src/main/jython/gremlin_python/driver/protocol.py | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/71587682/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
----------------------------------------------------------------------
diff --cc gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
index 1330483,2fc7c1b..014daff
--- a/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
+++ b/gremlin-python/src/main/jython/gremlin_python/driver/protocol.py
@@@ -85,13 -85,16 +86,15 @@@ class GremlinServerWSProtocol(AbstractB
elif status_code == 204:
result_set.stream.put_nowait([])
del results_dict[request_id]
+ return status_code
elif status_code in [200, 206]:
- results = []
- for msg in data["result"]["data"]:
- results.append(
- self._message_serializer.deserialize_message(msg))
- result_set.stream.put_nowait(results)
- if status_code == 200:
+ result_set.stream.put_nowait(data)
+ if status_code == 206:
+ message = self._transport.read()
+ self.data_received(message, results_dict)
+ else:
del results_dict[request_id]
+ return status_code
else:
del results_dict[request_id]
raise GremlinServerError(
[13/50] [abbrv] tinkerpop git commit: TinkerPop 3.3.3 release
Posted by sp...@apache.org.
TinkerPop 3.3.3 release
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2d39f9b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2d39f9b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2d39f9b8
Branch: refs/heads/TINKERPOP-1956
Commit: 2d39f9b803e02f18d09c8fc1cced29cb903eb7d0
Parents: d86fcc5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 8 14:06:53 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 8 14:06:53 2018 -0400
----------------------------------------------------------------------
giraph-gremlin/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-server/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
gremlin-archetype/pom.xml | 2 +-
gremlin-console/bin/gremlin.sh | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-core/pom.xml | 2 +-
gremlin-dotnet/pom.xml | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
gremlin-dotnet/src/pom.xml | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
gremlin-driver/pom.xml | 2 +-
gremlin-groovy/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
gremlin-python/pom.xml | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-shaded/pom.xml | 2 +-
gremlin-test/pom.xml | 2 +-
gremlin-tools/gremlin-benchmark/pom.xml | 2 +-
gremlin-tools/gremlin-coverage/pom.xml | 2 +-
gremlin-tools/gremlin-io-test/pom.xml | 2 +-
gremlin-tools/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
tinkergraph-gremlin/pom.xml | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 4bdbbcf..5c8e7fe 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>giraph-gremlin</artifactId>
<name>Apache TinkerPop :: Giraph Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index ca0fd53..812172b 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 3d0d167..409f3c8 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-archetype-server</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index 93d929d..5ccbe0c 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-archetype-tinkergraph</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 14d5753..79a8507 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 1b2b798..7fb090f 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.3.3-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.3.3-standalone/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index fefd6fe..d78d2a2 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-console</artifactId>
<name>Apache TinkerPop :: Gremlin Console</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index ffbc077..b2b168b 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 87adc63..883e533 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index 1a6bdad..d7bda56 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,7 +25,7 @@ limitations under the License.
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.3.3-SNAPSHOT</Version>
+ <Version>3.3.3</Version>
<FileVersion>3.3.3.0</FileVersion>
<AssemblyVersion>3.3.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index 0474e43..83c4a53 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index 26141b1..f51b421 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index d4c8dff..40f35c3 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 14d85f2..363c27e 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-groovy</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index b159b16..fb3fa84 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 76a2dd6..8907fab 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlin",
- "version": "3.3.3-alpha1",
+ "version": "3.3.3",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 175c38b..653ca72 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-python</artifactId>
<name>Apache TinkerPop :: Gremlin Python</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 2a23e2f..4a8b1ad 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-server</artifactId>
<name>Apache TinkerPop :: Gremlin Server</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index 409abe9..f565761 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-shaded</artifactId>
<name>Apache TinkerPop :: Gremlin Shaded</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 995fa19..f666d03 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-tools/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-benchmark/pom.xml b/gremlin-tools/gremlin-benchmark/pom.xml
index 5e2dc31..ee343fd 100644
--- a/gremlin-tools/gremlin-benchmark/pom.xml
+++ b/gremlin-tools/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-tools/gremlin-coverage/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-coverage/pom.xml b/gremlin-tools/gremlin-coverage/pom.xml
index 6119a5a..a934168 100644
--- a/gremlin-tools/gremlin-coverage/pom.xml
+++ b/gremlin-tools/gremlin-coverage/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-coverage</artifactId>
<name>Apache TinkerPop :: Gremlin Coverage</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-tools/gremlin-io-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/pom.xml b/gremlin-tools/gremlin-io-test/pom.xml
index e22dc15..a3fdeeb 100644
--- a/gremlin-tools/gremlin-io-test/pom.xml
+++ b/gremlin-tools/gremlin-io-test/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>gremlin-tools</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-io-test</artifactId>
<name>Apache TinkerPop :: Gremlin IO Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/gremlin-tools/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-tools/pom.xml b/gremlin-tools/pom.xml
index 780f973..bcb7abf 100644
--- a/gremlin-tools/pom.xml
+++ b/gremlin-tools/pom.xml
@@ -6,7 +6,7 @@
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>gremlin-tools</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index e384915..ccb5d55 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index e9fa0cf..641b9df 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b142d4b..3ef4da9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 92fd65b..663bb80 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>spark-gremlin</artifactId>
<name>Apache TinkerPop :: Spark Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d39f9b8/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index 80de750..f6e60c7 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.3.3-SNAPSHOT</version>
+ <version>3.3.3</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
[38/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1933'
into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1933' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa3fb9ea
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa3fb9ea
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa3fb9ea
Branch: refs/heads/TINKERPOP-1956
Commit: fa3fb9eac88ca7b7f3669b18d097f0e69e09bfaf
Parents: 770375d 4c8717d
Author: davebshow <da...@gmail.com>
Authored: Mon May 14 12:09:21 2018 -0700
Committer: davebshow <da...@gmail.com>
Committed: Mon May 14 12:09:21 2018 -0700
----------------------------------------------------------------------
.../src/main/jython/gremlin_python/driver/connection.py | 7 +++++--
.../src/main/jython/gremlin_python/driver/protocol.py | 8 ++++----
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[49/50] [abbrv] tinkerpop git commit: TINKERPOP-1956 Deprecated
Order.incr and Order.decr
Posted by sp...@apache.org.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
index 40ae6e9..ec59d33 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
@@ -42,7 +42,7 @@ import java.util.Set;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.GRATEFUL;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
-import static org.apache.tinkerpop.gremlin.process.traversal.Order.decr;
+import static org.apache.tinkerpop.gremlin.process.traversal.Order.desc;
import static org.apache.tinkerpop.gremlin.process.traversal.P.eq;
import static org.apache.tinkerpop.gremlin.process.traversal.P.neq;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.and;
@@ -166,7 +166,7 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_matchXa_hasXsong_name_sunshineX__a_mapX0followedBy_weight_meanX_b__a_0followedBy_c__c_filterXweight_whereXgteXbXXX_outV_dX_selectXdX_byXnameX();
// test order barriers
- public abstract Traversal<Vertex, Map<String, String>> get_g_V_matchXa_outEXcreatedX_order_byXweight_decrX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX();
+ public abstract Traversal<Vertex, Map<String, String>> get_g_V_matchXa_outEXcreatedX_order_byXweight_descX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX();
@Test
@@ -587,8 +587,8 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_matchXa_outEXcreatedX_order_byXweight_decrX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX() {
- final Traversal<Vertex, Map<String, String>> traversal = get_g_V_matchXa_outEXcreatedX_order_byXweight_decrX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX();
+ public void g_V_matchXa_outEXcreatedX_order_byXweight_descX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX() {
+ final Traversal<Vertex, Map<String, String>> traversal = get_g_V_matchXa_outEXcreatedX_order_byXweight_descX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX();
printTraversalForm(traversal);
checkResults(makeMapList(2,
"a", "marko", "b", "lop",
@@ -892,9 +892,9 @@ public abstract class MatchTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, String>> get_g_V_matchXa_outEXcreatedX_order_byXweight_decrX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX() {
+ public Traversal<Vertex, Map<String, String>> get_g_V_matchXa_outEXcreatedX_order_byXweight_descX_limitX1X_inV_b__b_hasXlang_javaXX_selectXa_bX_byXnameX() {
return g.V().match(
- as("a").outE("created").order().by("weight", decr).limit(1).inV().as("b"),
+ as("a").outE("created").order().by("weight", desc).limit(1).inV().as("b"),
as("b").has("lang", "java")).
<String>select("a", "b").by("name");
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MathTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MathTest.java
index 20d8392..04096ed 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MathTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MathTest.java
@@ -33,7 +33,7 @@ import java.util.function.BiFunction;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.Operator.sum;
-import static org.apache.tinkerpop.gremlin.process.traversal.Order.decr;
+import static org.apache.tinkerpop.gremlin.process.traversal.Order.desc;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.bothE;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.in;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.math;
@@ -54,7 +54,7 @@ public abstract class MathTest extends AbstractGremlinProcessTest {
public abstract Traversal<Integer, Double> get_g_withSackX1X_injectX1X_repeatXsackXsumX_byXconstantX1XXX_timesX5X_emit_mathXsin__X_byXsackX();
- public abstract Traversal<Vertex, String> get_g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_decrX_selectXcX();
+ public abstract Traversal<Vertex, String> get_g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_descX_selectXcX();
@Test
@LoadGraphWith(MODERN)
@@ -94,8 +94,8 @@ public abstract class MathTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_decrX_selectXcX() {
- final Traversal<Vertex, String> traversal = get_g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_decrX_selectXcX();
+ public void g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_descX_selectXcX() {
+ final Traversal<Vertex, String> traversal = get_g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_descX_selectXcX();
printTraversalForm(traversal);
checkResults(Arrays.asList("ripple", "josh", "marko", "vadas", "lop", "peter"), traversal);
}
@@ -123,8 +123,8 @@ public abstract class MathTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_decrX_selectXcX() {
- return g.V().project("a", "b", "c").by(bothE().values("weight").sum()).by(bothE().count()).by("name").order().by(math("a / b"), decr).select("c");
+ public Traversal<Vertex, String> get_g_V_projectXa_b_cX_byXbothE_weight_sumX_byXbothE_countX_byXnameX_order_byXmathXa_div_bX_descX_selectXcX() {
+ return g.V().project("a", "b", "c").by(bothE().values("weight").sum()).by(bothE().count()).by("name").order().by(math("a / b"), desc).select("c");
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index bbf63ef..3cb50aa 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -62,43 +62,47 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, String> get_g_V_order_byXname_incrX_name();
+ public abstract Traversal<Vertex, String> get_g_V_order_byXname_ascX_name();
+
public abstract Traversal<Vertex, String> get_g_V_order_byXnameX_name();
public abstract Traversal<Vertex, Double> get_g_V_outE_order_byXweight_decrX_weight();
+ public abstract Traversal<Vertex, Double> get_g_V_outE_order_byXweight_descX_weight();
+
public abstract Traversal<Vertex, String> get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name();
public abstract Traversal<Vertex, Map<String, Vertex>> get_g_V_asXaX_outXcreatedX_asXbX_order_byXshuffleX_selectXa_bX();
- public abstract Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(final Object v1Id);
+ public abstract Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_descX_byXkeys_ascX(final Object v1Id);
- public abstract Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX();
+ public abstract Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count_descX();
- public abstract Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXname_order_byXdecrX_foldX();
+ public abstract Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXname_order_byXdescX_foldX();
- public abstract Traversal<Vertex, List<Double>> get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX();
+ public abstract Traversal<Vertex, List<Double>> get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX();
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX();
+ public abstract Traversal<Vertex, Map<String, Object>> get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_descX();
public abstract Traversal<Vertex, Vertex> get_g_V_hasLabelXpersonX_order_byXageX();
public abstract Traversal<Vertex, List<Vertex>> get_g_V_hasLabelXpersonX_fold_orderXlocalX_byXageX();
- public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name();
+ public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXvalueXageX_descX_name();
- public abstract Traversal<Vertex, String> get_g_V_properties_order_byXkey_decrX_key();
+ public abstract Traversal<Vertex, String> get_g_V_properties_order_byXkey_descX_key();
- public abstract Traversal<Vertex, Vertex> get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX();
+ public abstract Traversal<Vertex, Vertex> get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_descX();
- public abstract Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name();
+ public abstract Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_descX_limitX5X_name();
- public abstract Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_decrX_name();
+ public abstract Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_descX_name();
- public abstract Traversal<Vertex, String> get_g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name();
+ public abstract Traversal<Vertex, String> get_g_V_hasLabelXsongX_order_byXperformances_descX_byXnameX_rangeX110_120X_name();
public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX();
- public abstract Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX();
+ public abstract Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_descX();
@Test
@LoadGraphWith(MODERN)
@@ -126,6 +130,14 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ public void g_V_order_byXname_ascX_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_order_byXname_ascX_name();
+ printTraversalForm(traversal);
+ checkOrderedResults(Arrays.asList("josh", "lop", "marko", "peter", "ripple", "vadas"), traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
public void g_V_order_byXnameX_name() {
final Traversal<Vertex, String> traversal = get_g_V_order_byXnameX_name();
printTraversalForm(traversal);
@@ -142,6 +154,14 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
+ public void g_V_outE_order_byXweight_descX_weight() {
+ final Traversal<Vertex, Double> traversal = get_g_V_outE_order_byXweight_descX_weight();
+ printTraversalForm(traversal);
+ checkOrderedResults(Arrays.asList(1.0d, 1.0d, 0.5d, 0.4d, 0.4d, 0.2d), traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
public void g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
final Traversal<Vertex, String> traversal = get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name();
printTraversalForm(traversal);
@@ -183,8 +203,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX() {
- final Traversal<Vertex, Map<Integer, Integer>> traversal = get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(convertToVertexId("marko"));
+ public void g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_descX_byXkeys_ascX() {
+ final Traversal<Vertex, Map<Integer, Integer>> traversal = get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_descX_byXkeys_ascX(convertToVertexId("marko"));
printTraversalForm(traversal);
final Map<Integer, Integer> map = traversal.next();
assertFalse(traversal.hasNext());
@@ -208,8 +228,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_order_byXoutE_count__decrX() {
- Arrays.asList(get_g_V_order_byXoutE_count__decrX()).forEach(traversal -> {
+ public void g_V_order_byXoutE_count_descX() {
+ Arrays.asList(get_g_V_order_byXoutE_count_descX()).forEach(traversal -> {
printTraversalForm(traversal);
final List<Vertex> vertices = traversal.toList();
assertEquals(vertices.size(), 6);
@@ -224,8 +244,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_group_byXlabelX_byXname_order_byXdecrX_foldX() {
- final Traversal<Vertex, Map<String, List<Vertex>>> traversal = get_g_V_group_byXlabelX_byXname_order_byXdecrX_foldX();
+ public void g_V_group_byXlabelX_byXname_order_byXdescX_foldX() {
+ final Traversal<Vertex, Map<String, List<Vertex>>> traversal = get_g_V_group_byXlabelX_byXname_order_byXdescX_foldX();
printTraversalForm(traversal);
final Map<String, List<Vertex>> map = traversal.next();
assertFalse(traversal.hasNext());
@@ -244,8 +264,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
- final Traversal<Vertex, List<Double>> traversal = get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX();
+ public void g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX() {
+ final Traversal<Vertex, List<Double>> traversal = get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX();
final List<List<Double>> list = traversal.toList();
assertEquals(list.get(0).size(), 3);
assertEquals(list.get(1).size(), 3);
@@ -264,8 +284,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX();
+ public void g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_descX() {
+ final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_descX();
final List<Map<String, Object>> list = traversal.toList();
assertEquals(convertToVertex(graph, "josh"), list.get(0).get("v"));
assertEquals(2.4d, (Double) list.get(0).get("s"), 0.1d);
@@ -305,16 +325,16 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name() {
- final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name();
+ public void g_V_hasLabelXpersonX_order_byXvalueXageX_descX_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXvalueXageX_descX_name();
printTraversalForm(traversal);
checkOrderedResults(Arrays.asList("peter", "josh", "marko", "vadas"), traversal);
}
@Test
@LoadGraphWith(MODERN)
- public void g_V_properties_order_byXkey_decrX_key() {
- final Traversal<Vertex, String> traversal = get_g_V_properties_order_byXkey_decrX_key();
+ public void g_V_properties_order_byXkey_descX_key() {
+ final Traversal<Vertex, String> traversal = get_g_V_properties_order_byXkey_descX_key();
printTraversalForm(traversal);
checkOrderedResults(Arrays.asList(
"name", "name", "name", "name", "name", "name",
@@ -324,8 +344,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(GRATEFUL)
- public void g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX() {
- final Traversal<Vertex, Vertex> traversal = get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX();
+ public void g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_descX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_descX();
printTraversalForm(traversal);
int counter = 0;
String lastSongType = "a";
@@ -346,8 +366,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name() {
- final Traversal<Vertex, String> traversal = get_g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name();
+ public void g_V_both_hasLabelXpersonX_order_byXage_descX_limitX5X_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_both_hasLabelXpersonX_order_byXage_descX_limitX5X_name();
printTraversalForm(traversal);
checkOrderedResults(Arrays.asList("peter", "josh", "josh", "josh", "marko"), traversal);
}
@@ -355,8 +375,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@IgnoreEngine(TraversalEngine.Type.STANDARD) // validating the internal sort/limit works in GraphComputer
@LoadGraphWith(MODERN)
- public void g_V_both_hasLabelXpersonX_order_byXage_decrX_name() {
- final Traversal<Vertex, String> traversal = get_g_V_both_hasLabelXpersonX_order_byXage_decrX_name();
+ public void g_V_both_hasLabelXpersonX_order_byXage_descX_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_both_hasLabelXpersonX_order_byXage_descX_name();
traversal.asAdmin().applyStrategies();
if (!TraversalHelper.getFirstStepOfAssignableClass(OrderGlobalStep.class, traversal.asAdmin()).isPresent())
return; // total hack to avoid providers that don't compile to OrderGlobalStep
@@ -369,8 +389,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(GRATEFUL)
- public void g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name() {
- final Traversal<Vertex, String> traversal = get_g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name();
+ public void g_V_hasLabelXsongX_order_byXperformances_descX_byXnameX_rangeX110_120X_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_hasLabelXsongX_order_byXperformances_descX_byXnameX_rangeX110_120X_name();
printTraversalForm(traversal);
checkOrderedResults(Arrays.asList(
"WANG DANG DOODLE", "THE ELEVEN", "WAY TO GO HOME", "FOOLISH HEART",
@@ -404,8 +424,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX() {
- final Traversal<Vertex, Map.Entry<String, Number>> traversal = get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX();
+ public void g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_descX() {
+ final Traversal<Vertex, Map.Entry<String, Number>> traversal = get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_descX();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
Map.Entry<String, Number> entry = traversal.next();
@@ -441,6 +461,11 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, String> get_g_V_order_byXname_ascX_name() {
+ return g.V().order().by("name", Order.asc).values("name");
+ }
+
+ @Override
public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
return g.V().order().by("name").values("name");
}
@@ -451,6 +476,11 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Double> get_g_V_outE_order_byXweight_descX_weight() {
+ return g.V().outE().order().by("weight", Order.desc).values("weight");
+ }
+
+ @Override
public Traversal<Vertex, String> get_g_V_order_byXname_a1_b1X_byXname_b2_a2X_name() {
return g.V().order().
<String>by("name", (a, b) -> a.substring(1, 2).compareTo(b.substring(1, 2))).
@@ -463,7 +493,7 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(final Object v1Id) {
+ public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_descX_byXkeys_ascX(final Object v1Id) {
return g.V(v1Id).hasLabel("person").map(v -> {
final Map<Integer, Integer> map = new HashMap<>();
map.put(1, (int) v.get().value("age"));
@@ -471,27 +501,27 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
map.put(3, (int) v.get().value("age") * 3);
map.put(4, (int) v.get().value("age"));
return map;
- }).order(Scope.local).by(Column.values, Order.decr).by(Column.keys, Order.incr);
+ }).order(Scope.local).by(Column.values, Order.desc).by(Column.keys, Order.asc);
}
@Override
- public Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count__decrX() {
- return g.V().order().by(outE().count(), Order.decr);
+ public Traversal<Vertex, Vertex> get_g_V_order_byXoutE_count_descX() {
+ return g.V().order().by(outE().count(), Order.desc);
}
@Override
- public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXname_order_byXdecrX_foldX() {
- return g.V().<String, List<Vertex>>group().by(T.label).by(__.values("name").order().by(Order.decr).fold());
+ public Traversal<Vertex, Map<String, List<Vertex>>> get_g_V_group_byXlabelX_byXname_order_byXdescX_foldX() {
+ return g.V().<String, List<Vertex>>group().by(T.label).by(__.values("name").order().by(Order.desc).fold());
}
@Override
- public Traversal<Vertex, List<Double>> get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_decrX() {
- return g.V().local(__.bothE().<Double>values("weight").fold()).order().by(__.sum(Scope.local), Order.decr);
+ public Traversal<Vertex, List<Double>> get_g_V_localXbothE_weight_foldX_order_byXsumXlocalX_descX() {
+ return g.V().local(__.bothE().<Double>values("weight").fold()).order().by(__.sum(Scope.local), Order.desc);
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_decrX() {
- return g.V().as("v").map(__.bothE().<Double>values("weight").fold()).sum(Scope.local).as("s").select("v", "s").order().by(__.select("s"), Order.decr);
+ public Traversal<Vertex, Map<String, Object>> get_g_V_asXvX_mapXbothE_weight_foldX_sumXlocalX_asXsX_selectXv_sX_order_byXselectXsX_descX() {
+ return g.V().as("v").map(__.bothE().<Double>values("weight").fold()).sum(Scope.local).as("s").select("v", "s").order().by(__.select("s"), Order.desc);
}
@Override
@@ -505,33 +535,33 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name() {
- return g.V().hasLabel("person").order().<Vertex>by(v -> v.value("age"), Order.decr).values("name");
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXvalueXageX_descX_name() {
+ return g.V().hasLabel("person").order().<Vertex>by(v -> v.value("age"), Order.desc).values("name");
}
@Override
- public Traversal<Vertex, String> get_g_V_properties_order_byXkey_decrX_key() {
- return g.V().properties().order().by(T.key, Order.decr).key();
+ public Traversal<Vertex, String> get_g_V_properties_order_byXkey_descX_key() {
+ return g.V().properties().order().by(T.key, Order.desc).key();
}
@Override
- public Traversal<Vertex, Vertex> get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX() {
- return g.V().has("song", "name", "OH BOY").out("followedBy").out("followedBy").order().by("performances").by("songType", Order.decr);
+ public Traversal<Vertex, Vertex> get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_descX() {
+ return g.V().has("song", "name", "OH BOY").out("followedBy").out("followedBy").order().by("performances").by("songType", Order.desc);
}
@Override
- public Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_decrX_limitX5X_name() {
- return g.V().both().hasLabel("person").order().by("age", Order.decr).limit(5).values("name");
+ public Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_descX_limitX5X_name() {
+ return g.V().both().hasLabel("person").order().by("age", Order.desc).limit(5).values("name");
}
@Override
- public Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_decrX_name() {
- return g.V().both().hasLabel("person").order().by("age", Order.decr).values("name");
+ public Traversal<Vertex, String> get_g_V_both_hasLabelXpersonX_order_byXage_descX_name() {
+ return g.V().both().hasLabel("person").order().by("age", Order.desc).values("name");
}
@Override
- public Traversal<Vertex, String> get_g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name() {
- return g.V().hasLabel("song").order().by("performances", Order.decr).by("name").range(110, 120).values("name");
+ public Traversal<Vertex, String> get_g_V_hasLabelXsongX_order_byXperformances_descX_byXnameX_rangeX110_120X_name() {
+ return g.V().hasLabel("song").order().by("performances", Order.desc).by("name").range(110, 120).values("name");
}
@Override
@@ -540,8 +570,8 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX() {
- return g.V().hasLabel("person").group().by("name").by(outE().values("weight").sum()).<Map.Entry<String, Number>>unfold().order().by(Column.values, Order.decr);
+ public Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_descX() {
+ return g.V().hasLabel("person").group().by("name").by(outE().values("weight").sum()).<Map.Entry<String, Number>>unfold().order().by(Column.values, Order.desc);
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
index d2cb0eb..07a2b04 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PageRankTest.java
@@ -51,9 +51,9 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX();
- public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name();
+ public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_descX_name();
- public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X();
+ public abstract Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_descX_name_limitX2X();
public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_valueMapXname_friendRankX();
@@ -99,8 +99,8 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_pageRank_order_byXpageRank_decrX_name() {
- final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_decrX_name();
+ public void g_V_pageRank_order_byXpageRank_descX_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_descX_name();
printTraversalForm(traversal);
final List<String> names = traversal.toList();
assertEquals(6, names.size());
@@ -137,8 +137,8 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_pageRank_order_byXpageRank_decrX_name_limitX2X() {
- final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X();
+ public void g_V_pageRank_order_byXpageRank_descX_name_limitX2X() {
+ final Traversal<Vertex, String> traversal = get_g_V_pageRank_order_byXpageRank_descX_name_limitX2X();
printTraversalForm(traversal);
final List<String> names = traversal.toList();
assertEquals(2, names.size());
@@ -256,13 +256,13 @@ public abstract class PageRankTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name() {
- return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.decr).values("name");
+ public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_descX_name() {
+ return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.desc).values("name");
}
@Override
- public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_decrX_name_limitX2X() {
- return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.decr).<String>values("name").limit(2);
+ public Traversal<Vertex, String> get_g_V_pageRank_order_byXpageRank_descX_name_limitX2X() {
+ return g.V().pageRank().order().by(PageRankVertexProgram.PAGE_RANK, Order.desc).<String>values("name").limit(2);
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
index db76bbc..1923352 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProgramTest.java
@@ -71,7 +71,7 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Vertex> get_g_V_programXpageRankX();
- public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
+ public abstract Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_ascX_valueMapXname_rankX();
public abstract Traversal<Vertex, Map<String, Object>> get_g_V_outXcreatedX_aggregateXxX_byXlangX_groupCount_programXTestProgramX_asXaX_selectXa_xX();
@@ -91,8 +91,8 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_decrX_valueMapXname_rankX() {
- final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX();
+ public void g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_ascX_valueMapXname_rankX() {
+ final Traversal<Vertex, Map<String, List<Object>>> traversal = get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_ascX_valueMapXname_rankX();
printTraversalForm(traversal);
int counter = 0;
double lastRank = Double.MIN_VALUE;
@@ -148,8 +148,8 @@ public abstract class ProgramTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_incrX_valueMapXname_rankX() {
- return g.V().hasLabel("person").program(PageRankVertexProgram.build().property("rank").create(graph)).order().by("rank", Order.incr).valueMap("name", "rank");
+ public Traversal<Vertex, Map<String, List<Object>>> get_g_V_hasLabelXpersonX_programXpageRank_rankX_order_byXrank_ascX_valueMapXname_rankX() {
+ return g.V().hasLabel("person").program(PageRankVertexProgram.build().property("rank").create(graph)).order().by("rank", Order.asc).valueMap("name", "rank");
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProjectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProjectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProjectTest.java
index 3fd7ad3..6bfae90 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProjectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/ProjectTest.java
@@ -40,7 +40,7 @@ public abstract class ProjectTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXpersonX_projectXa_bX_byXoutE_countX_byXageX();
- public abstract Traversal<Vertex, String> get_g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__decrX_selectXaX();
+ public abstract Traversal<Vertex, String> get_g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX();
@Test
@LoadGraphWith(MODERN)
@@ -56,8 +56,8 @@ public abstract class ProjectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__decrX_selectXaX() {
- final Traversal<Vertex, String> traversal = get_g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__decrX_selectXaX();
+ public void g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX() {
+ final Traversal<Vertex, String> traversal = get_g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX();
printTraversalForm(traversal);
final List<String> names = traversal.toList();
assertEquals(4, names.size());
@@ -75,8 +75,8 @@ public abstract class ProjectTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, String> get_g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__decrX_selectXaX() {
- return g.V().out("created").project("a", "b").by("name").by(__.in("created").count()).order().by(__.select("b"), Order.decr).select("a");
+ public Traversal<Vertex, String> get_g_V_outXcreatedX_projectXa_bX_byXnameX_byXinXcreatedX_countX_order_byXselectXbX__descX_selectXaX() {
+ return g.V().out("created").project("a", "b").by("name").by(__.in("created").count()).order().by(__.select("b"), Order.desc).select("a");
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
index 3140004..72a1872 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
@@ -73,7 +73,7 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, String>> get_g_V_asXaX_name_order_asXbX_selectXa_bX_byXnameX_by_XitX();
- public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX();
+ public abstract Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_ascX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX();
public abstract Traversal<Vertex, Vertex> get_g_V_hasXname_isXmarkoXX_asXaX_selectXaX();
@@ -254,8 +254,8 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(CREW)
- public void g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX() {
- final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX();
+ public void g_V_hasXname_gremlinX_inEXusesX_order_byXskill_ascX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX() {
+ final Traversal<Vertex, Map<String, Object>> traversal = get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_ascX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX();
printTraversalForm(traversal);
final List<Map<String, Object>> expected = makeMapList(2,
"a", 3, "b", "matthias",
@@ -731,8 +731,8 @@ public abstract class SelectTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_incrX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX() {
- return g.V().has("name", "gremlin").inE("uses").order().by("skill", Order.incr).as("a").outV().as("b").select("a", "b").by("skill").by("name");
+ public Traversal<Vertex, Map<String, Object>> get_g_V_hasXname_gremlinX_inEXusesX_order_byXskill_ascX_asXaX_outV_asXbX_selectXa_bX_byXskillX_byXnameX() {
+ return g.V().has("name", "gremlin").inE("uses").order().by("skill", Order.asc).as("a").outV().as("b").select("a", "b").by("skill").by("name");
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
index 10473a8..f06b0f7 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategyProcessTest.java
@@ -484,7 +484,7 @@ public class SubgraphStrategyProcessTest extends AbstractGremlinProcessTest {
checkResults(makeMapList(1, "seattle", 1L), sg.V().groupCount().by("location"));
//
sg = g.withStrategies(SubgraphStrategy.build().vertices(has("location")).vertexProperties(hasNot("endTime")).create());
- checkOrderedResults(Arrays.asList("aachen", "purcellville", "santa fe", "seattle"), sg.V().order().by("location", Order.incr).values("location"));
+ checkOrderedResults(Arrays.asList("aachen", "purcellville", "santa fe", "seattle"), sg.V().order().by("location", Order.asc).values("location"));
//
sg = g.withStrategies(SubgraphStrategy.create(new MapConfiguration(new HashMap<String, Object>() {{
put(SubgraphStrategy.VERTICES, __.has("location"));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
index 28c6d77..9fd161a 100644
--- a/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
+++ b/gremlin-test/src/test/java/org/apache/tinkerpop/gremlin/process/FeatureCoverageTest.java
@@ -118,8 +118,8 @@ public class FeatureCoverageTest {
"g_V_matchXa_0sungBy_b__a_0writtenBy_c__b_writtenBy_dX_whereXc_sungBy_dX_whereXd_hasXname_GarciaXX",
"get_g_V_matchXa_followedBy_count_isXgtX10XX_b__a_0followedBy_count_isXgtX10XX_bX_count",
"g_V_matchXa_followedBy_count_isXgtX10XX_b__a_0followedBy_count_isXgtX10XX_bX_count",
- "g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX",
- "g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name",
+ "g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_descX",
+ "g_V_hasLabelXsongX_order_byXperformances_descX_byXnameX_rangeX110_120X_name",
// Pop tests not organized right for GLVs
"g_V_valueMap_selectXpop_aX",
"g_V_selectXa_bX",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
index f6905ae..e8a0e63 100644
--- a/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
+++ b/gremlin-tools/gremlin-io-test/src/main/java/org/apache/tinkerpop/gremlin/structure/io/Model.java
@@ -145,7 +145,7 @@ public class Model {
addGraphProcessEntry(Column.keys, "Column", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(Direction.OUT, "Direction", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(Operator.sum, "Operator", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
- addGraphProcessEntry(Order.incr, "Order", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
+ addGraphProcessEntry(Order.shuffle, "Order", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(TraversalOptionParent.Pick.any, "Pick", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(Pop.all, "Pop", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
addGraphProcessEntry(org.apache.tinkerpop.gremlin.util.function.Lambda.function("{ it.get() }"), "Lambda", "", Compatibilities.UNTYPED_GRAPHSON.matchToArray());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
index 87f8d70..67e5901 100644
--- a/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
+++ b/gremlin-tools/gremlin-io-test/src/test/java/org/apache/tinkerpop/gremlin/structure/io/AbstractTypedCompatibilityTest.java
@@ -62,12 +62,10 @@ import java.time.Year;
import java.time.YearMonth;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Date;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_3/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_4/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_5/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_6/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_7/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_8/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_2_9/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_0/order-v3d0.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json
index 8f2c236..7446df0 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-no-types.json
@@ -1 +1 @@
-"incr"
\ No newline at end of file
+"shuffle"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_1/order-v3d0.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_2/order-v3d0.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v2d0-partial.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json
index 6ad66d8..4be0432 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/graphson/_3_3_3/order-v3d0.json
@@ -1,4 +1,4 @@
{
"@type" : "g:Order",
- "@value" : "incr"
+ "@value" : "shuffle"
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_3/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_4/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_5/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_5/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_5/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_5/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_5/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_6/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_6/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_6/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_6/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_6/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_7/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_7/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_7/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_7/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_7/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_8/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_8/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_8/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_8/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_8/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_9/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_9/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_9/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_9/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_2_9/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v3d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v3d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_0/order-v3d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v3d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v3d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_1/order-v3d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v3d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v3d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_2/order-v3d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v1d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v1d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v1d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v1d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v1d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/20a722a3/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v3d0.kryo
----------------------------------------------------------------------
diff --git a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v3d0.kryo b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v3d0.kryo
index 40fdece..c8c7811 100644
--- a/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v3d0.kryo
+++ b/gremlin-tools/gremlin-io-test/src/test/resources/org/apache/tinkerpop/gremlin/structure/io/gryo/_3_3_3/order-v3d0.kryo
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
[33/50] [abbrv] tinkerpop git commit: Added more release manager docs
CTR
Posted by sp...@apache.org.
Added more release manager docs CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/90e74768
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/90e74768
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/90e74768
Branch: refs/heads/TINKERPOP-1956
Commit: 90e747688a860fdcbe5ae52d025144e52c9f4f4c
Parents: cc7d2e2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 10:55:18 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 10:55:18 2018 -0400
----------------------------------------------------------------------
.../developer/development-environment.asciidoc | 56 ++++++++++----------
docs/src/dev/developer/release.asciidoc | 46 ++++++++--------
2 files changed, 51 insertions(+), 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90e74768/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 3e3edad..4dfbcaa 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -97,6 +97,8 @@ integration tests and therefore must be actively switched on with `-DskipIntegra
[source,text]
mvn clean install -pl gremlin-console -DskipIntegrationTests=false
+See the <<release-environment,Release Environment>> section for more information on release manager configurations.
+
[[dotnet-environment]]
=== DotNet Environment
@@ -114,33 +116,16 @@ and `test` directories of the `gremlin-dotnet` module  which will signify to Ma
The `.glv` file need not have any contents and is ignored by Git. A standard `mvn clean install` will then build
`gremlin-dotnet` in full.
-For those who will release TinkerPop, it is also necessary to install link:http://www.mono-project.com/[Mono]. The
-release process is known to work with 5.0.1, so it is best to probably install that version. Release managers should
-probably also do an install of link:https://dist.nuget.org/win-x86-commandline/v3.4.4/nuget.exe[nuget 3.4.4] as it
-will help with environmental setup. To get an environment ready to deploy to NuGet, it is necessary to have a
-NuGet API key (PMC members who have NuGet accounts can help with that). The API key should be added to `NuGet.Config`
-with the following:
-
-[source,text]
-----
-mono nuget.exe setApiKey [your-api-key]
-----
-
-This should update `~/.config/NuGet/NuGet.Config` a file with an entry containing the encrypted API key. On
-`mvn deploy`, this file will be referenced on the automated `nuget push`.
-
-See release documentation for more information on configuration for release.
-
+See the <<release-environment,Release Environment>> section for more information on release manager configurations.
[[nodejs-environment]]
=== JavaScript Environment
+
When building `gremlin-javascript`, mvn command will include a local copy of Node.js runtime and npm inside your project
using `com.github.eirslett:frontend-maven-plugin` plugin. This copy of the Node.js runtime will not affect any
other existing Node.js runtime instances in your machine.
-The release manager should have the authentication token set, for more information see the Release Environment
-section below.
-
+See the <<release-environment,Release Environment>> section for more information on release manager configurations.
[[release-environment]]
=== Release Environment
@@ -152,9 +137,9 @@ link:https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS[development] and
link:https://dist.apache.org/repos/dist/release/tinkerpop/KEYS[release] distribution directories and committed
using Apache Subversion (SVN).
-Uploading to pypi uses link:https://pypi.python.org/pypi/twine[twine] which is automatically installed by the build
-process in maven. Twine refers to `HOME/.pypirc` file for configuration on the pypi deploy environments and username
-and password combinations. The file typically looks like this:
+For Python releases, uploading to pypi uses link:https://pypi.python.org/pypi/twine[twine] which is automatically
+installed by the build process in maven. Twine refers to `HOME/.pypirc` file for configuration on the pypi deploy
+environments and username and password combinations. The file typically looks like this:
[source,text]
----
@@ -164,7 +149,6 @@ index-servers=
pypitest
[pypitest]
-repository = https://testpypi.python.org/pypi
username = <username>
password =
@@ -174,12 +158,30 @@ username = <username>
password =
----
-The release manager shall use the project's pypi credentials, which are available in the PMC repository.
-The `password` should be left blank so the deployment process in Maven will prompt for it at deployment time.
+The release manager shall use the project's pypi credentials, which are available in the
+link:https://svn.apache.org/repos/private/pmc/tinkerpop[PMC SVN repository]. The `password` should be left blank so
+the deployment process in Maven will prompt for it at deployment time.
+
+For .NET releases, install link:http://www.mono-project.com/[Mono]. The release process is known to work with 5.0.1,
+so it is best to probably install that version. Release managers should probably also do an install of
+link:https://dist.nuget.org/win-x86-commandline/v3.4.4/nuget.exe[nuget 3.4.4] as it will help with environmental setup.
+To get an environment ready to deploy to NuGet, it is necessary to have a NuGet API key. First, create an account with
+link:https://www.nuget.org[nuget] and request that a PMC member add your account to the Gremlin.Net package in nuget
+so that you can deploy. Next, generate an API key for your account on the nuget website. The API key should be added
+to `NuGet.Config` with the following:
+
+[source,text]
+----
+mono nuget.exe setApiKey [your-api-key]
+----
+
+This should update `~/.config/NuGet/NuGet.Config` a file with an entry containing the encrypted API key. On
+`mvn deploy`, this file will be referenced on the automated `nuget push`.
To deploy `gremlin-javascript` on the link:https://www.npmjs.com[npm registry], the release manager must set the
authentication information on the ~/.npmrc file. The easiest way to do that is to use the `npm adduser` command. This
-must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system.
+must be done only once, as the auth token doesn't have an expiration date and it's stored on your file system. If
+this account is newly created then request that a PMC member add your account to the "gremlin" package on npm.
[[building-testing]]
== Building and Testing
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90e74768/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 1a7ef82..8631a74 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -27,18 +27,16 @@ feedback. Once a release point has been identified, the following phases repres
* Submit the official release for PMC vote.
* Release and promote.
-NOTE: It might be helpful to use this document as generated from the currently release as opposed to one generate
-from a previous version or from recent `SNAPSHOT`. When using one generated for release, all the "versions" in the
-commands end up being set to the version that is being released, making cut and paste of those commands less labor
-intensive and error prone.
+IMPORTANT: During release, it is best to use the current SNAPSHOT version of this documentation to ensure that you have
+the latest updates as almost every release includes improved documentation that may involve new or revised steps to
+execute.
IMPORTANT: The following instructions assume that the release manager's <<development-environment,environment>> is setup
-properly for release and includes a `.glv` file in `gremlin-python` as described in the <<python-environment,Python Environment>>
-section, so that the `gremlin-python` module builds in full.
+properly for release and includes a `.glv` files in the various GLV modules, so that they all build in full.
=== Development Versions
-A "development version" or snapshot (in Java parlance) is not an "official" release. Artifacts produced for a
+A "development version" or "snapshot" (in Java parlance) is not an "official" release. Artifacts produced for a
snapshot are solely for the convenience of providers and other developers who want to use the latest releases of
TinkerPop. These releases do not require a VOTE and do not require a "release manager". Any PMC member can deploy them.
It is important to note that these releases cannot be promoted outside of the developer mailing list and should not be
@@ -51,34 +49,32 @@ For JVM-based artifacts, simply use the following command:
[source,text]
mvn clean deploy
-and artifacts will be pushed to the link:http://repository.apache.org/snapshots/[Apache Snapshot Repository]. Python
+and artifacts will be pushed to the link:http://repository.apache.org/snapshots/[Apache Snapshot Repository]. GLV
development artifacts must be generated and deployed separately with additional commands:
[source,text]
+----
mvn clean install -Pglv-python
mvn deploy -pl gremlin-python -Dpypi
+mvn clean install -pl :gremlin-dotnet,:gremlin-dotnet-source -Dnuget
+mvn deploy -pl :gremlin-dotnet-source -Dnuget
+mvn deploy -pl gremlin-javascript -Dnpm`
+----
+
+Python, .NET and Javascript do not use the snapshot model the JVM does, however, the build is smart in that it will
+dynamically generate a development version number for the GLV artifacts when "-SNAPSHOT" is in the `pom.xml`.
+
+If you wish to verify that `mvn deploy` works before doing it officially then:
-Python does not use the snapshot model the JVM does, however, the build is smart in that it will dynamically
-generate a development version number for the Python artifacts when "-SNAPSHOT" is in the `pom.xml`. The previous
-command will push the development version to link:https://pypi.python.org/pypi/gremlinpython/[pypi] for distribution.
-Use the `testpypi` test environment by updating the `gremlin-python/pom.xml` to verify the `mvn deploy` command works.
+* For Python, use the `testpypi` test environment by updating the `gremlin-python/pom.xml`.
+* For .NET, use the `staging.nuget.org` environment by updating the `gremlin-dot-source/pom.xml`
IMPORTANT: The `clean` in the above commands is more important to the pypi deployment because the process will deploy
anything found in the `target/python-packaged/dist` directory. Since the names of the artifacts are based on
timestamps, they will not overwrite one another and multiple artifacts will get uploaded.
-For .NET and NuGet, development artifacts can be created as follows:
-
-[source,text]
-mvn clean install -pl :gremlin-dotnet,:gremlin-dotnet-source -Dnuget
-mvn deploy -pl :gremlin-dotnet-source -Dnuget
-
-As with PyPi, NuGet does not support a snapshot model as Java does. The commands above will dynamically generate a
-version number when "-SNAPSHOT" is in the `pom.xml`. Use the `staging.nuget.org` environment by updating the
-`gremlin-dot-source/pom.xml` to ensure the `mvn deploy` command works.
-
-IMPORTANT: These commands will dynamically edit the `gremlin-dotnet-source/Gremlin.Net.csproj`. Take care to commit
-or not commit changes related to that as necessary.
+WARNING: These commands will dynamically edit certain files in the various GLVs given automated version number changes.
+Take care to commit or not commit changes related to that as necessary.
== Release Manager Requirements
@@ -235,6 +231,8 @@ for generating javadoc and without that the binary distributions won't contain t
.. `mvn deploy -pl gremlin-python -DskipTests -Dpypi`
.. `mvn deploy -pl :gremlin-dotnet-source -DskipTests -Dnuget`
.. `mvn deploy -pl gremlin-javascript -DskipTests -Dnpm`
+. Review the GLV releases at link:https://pypi.org/project/gremlinpython/[PyPi],
+link:https://www.nuget.org/packages/Gremlin.Net/[nuget] and link:https://www.npmjs.com/package/gremlin[npm]
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
. `svn co --depth empty https://dist.apache.org/repos/dist/release/tinkerpop release; mkdir release/xx.yy.zz`
. Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.
[03/50] [abbrv] tinkerpop git commit: Merge branch 'TINKERPOP-1944'
into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1944' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8671622e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8671622e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8671622e
Branch: refs/heads/TINKERPOP-1956
Commit: 8671622ec5da41774e5684ebd3a514211dd27369
Parents: 5fea198 d037ef7
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Wed May 2 08:49:28 2018 -0400
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Wed May 2 08:49:28 2018 -0400
----------------------------------------------------------------------
.../main/javascript/gremlin-javascript/index.js | 20 +++++++++++---------
.../test/unit/exports-test.js | 2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[24/50] [abbrv] tinkerpop git commit: Updated site for 3.2.9/3.3.3
release CTR
Posted by sp...@apache.org.
Updated site for 3.2.9/3.3.3 release CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d492136d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d492136d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d492136d
Branch: refs/heads/TINKERPOP-1956
Commit: d492136dcb3725d4783fd7b5d7d4d30eb7a5ace1
Parents: b63e2f9
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 14:43:33 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:43:33 2018 -0400
----------------------------------------------------------------------
docs/site/home/downloads.html | 60 ++++++++++++++++++++-----
docs/site/home/index.html | 10 ++---
docs/site/home/template/header-footer.html | 12 ++---
3 files changed, 60 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d492136d/docs/site/home/downloads.html
----------------------------------------------------------------------
diff --git a/docs/site/home/downloads.html b/docs/site/home/downloads.html
index f5f0ab3..fd27d66 100644
--- a/docs/site/home/downloads.html
+++ b/docs/site/home/downloads.html
@@ -35,7 +35,48 @@ limitations under the License.
<table class="table">
<tr>
<td>
- <strong>3.3.2</strong> (latest, stable)
+ <strong>3.3.3</strong> (latest, stable)
+ </td>
+ <td>
+ 8-May-2018
+ </td>
+ <td>
+ <a href="https://github.com/apache/tinkerpop/blob/3.3.3/CHANGELOG.asciidoc#release-3-3-3">release notes</a> |
+ <a href="http://tinkerpop.apache.org/docs/3.3.3/upgrade/#_tinkerpop_3_3_3">upgrade</a> |
+ <a href="http://tinkerpop.apache.org/docs/3.3.3/">documentation</a> |
+ <a href="http://tinkerpop.apache.org/javadocs/3.3.3/full/">javadoc</a>
+ </td>
+ <td align="right">
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.3/apache-tinkerpop-gremlin-console-3.3.3-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.3/apache-tinkerpop-gremlin-server-3.3.3-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.3/apache-tinkerpop-3.3.3-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <strong>3.2.9</strong> (maintenance)
+ </td>
+ <td>
+ 8-May-2018
+ </td>
+ <td>
+ <a href="https://github.com/apache/tinkerpop/blob/3.2.9/CHANGELOG.asciidoc#release-3-2-9">release notes</a> |
+ <a href="http://tinkerpop.apache.org/docs/3.2.9/upgrade/#_tinkerpop_3_2_9">upgrade</a> |
+ <a href="http://tinkerpop.apache.org/docs/3.2.9/">documentation</a> |
+ <a href="http://tinkerpop.apache.org/javadocs/3.2.9/full/">javadoc</a>
+ </td>
+ <td align="right">
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.2.9/apache-tinkerpop-gremlin-console-3.2.9-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.2.9/apache-tinkerpop-gremlin-server-3.2.9-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.2.9/apache-tinkerpop-3.2.9-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
+ </td>
+ </tr>
+ </table>
+ <h4>Archived Releases</h4>
+ <table class="table">
+ <tr>
+ <td>
+ <strong>3.3.2</strong>
</td>
<td>
2-Apr-2018
@@ -47,14 +88,14 @@ limitations under the License.
<a href="http://tinkerpop.apache.org/javadocs/3.3.2/full/">javadoc</a>
</td>
<td align="right">
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.2/apache-tinkerpop-gremlin-console-3.3.2-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.2/apache-tinkerpop-gremlin-server-3.3.2-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.2/apache-tinkerpop-3.3.2-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://archive.apache.org/dist/tinkerpop/3.3.2/apache-tinkerpop-gremlin-console-3.3.2-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://archive.apache.org/dist/tinkerpop/3.3.2/apache-tinkerpop-gremlin-server-3.3.2-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://archive.apache.org/dist/tinkerpop/3.3.2/apache-tinkerpop-3.3.2-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
</td>
</tr>
<tr>
<td>
- <strong>3.2.8</strong> (maintenance)
+ <strong>3.2.8</strong>
</td>
<td>
2-Apr-2018
@@ -66,14 +107,11 @@ limitations under the License.
<a href="http://tinkerpop.apache.org/javadocs/3.2.8/full/">javadoc</a>
</td>
<td align="right">
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.2.8/apache-tinkerpop-gremlin-console-3.2.8-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.2.8/apache-tinkerpop-gremlin-server-3.2.8-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.2.8/apache-tinkerpop-3.2.8-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://archive.apache.org/dist/tinkerpop/3.2.8/apache-tinkerpop-gremlin-console-3.2.8-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://archive.apache.org/dist/tinkerpop/3.2.8/apache-tinkerpop-gremlin-server-3.2.8-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://archive.apache.org/dist/tinkerpop/3.2.8/apache-tinkerpop-3.2.8-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
</td>
</tr>
- </table>
- <h4>Archived Releases</h4>
- <table class="table">
<tr>
<td>
<strong>3.3.1</strong>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d492136d/docs/site/home/index.html
----------------------------------------------------------------------
diff --git a/docs/site/home/index.html b/docs/site/home/index.html
index 9152a7e..9ee55c5 100644
--- a/docs/site/home/index.html
+++ b/docs/site/home/index.html
@@ -25,13 +25,13 @@ limitations under the License.
<div class="col-md-6">
<br/>
<p>
- <b><font size="4">TinkerPop</font> <font size="4">3.3.2</font></b> (<font size="2">Released: 2-Apr-2018</font>)
+ <b><font size="4">TinkerPop</font> <font size="4">3.3.3</font></b> (<font size="2">Released: 8-May-2018</font>)
</p>
<p><b>Downloads</b></p>
<p>
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.2/apache-tinkerpop-gremlin-console-3.3.2-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.2/apache-tinkerpop-gremlin-server-3.3.2-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
- <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.2/apache-tinkerpop-3.3.2-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.3/apache-tinkerpop-gremlin-console-3.3.3-bin.zip" class="btn btn-primary">Gremlin Console <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.3/apache-tinkerpop-gremlin-server-3.3.3-bin.zip" class="btn btn-primary">Gremlin Server <span class="glyphicon glyphicon-download-alt"></span></a>
+ <a href="https://www.apache.org/dyn/closer.lua/tinkerpop/3.3.3/apache-tinkerpop-3.3.3-src.zip" class="btn btn-primary">Source <span class="glyphicon glyphicon-download-alt"></span></a>
</p>
<div class="row">
<div class="col-md-6">
@@ -41,7 +41,7 @@ limitations under the License.
<ul>
<li><a href="http://tinkerpop.apache.org/docs/current/reference">Reference Documentation</a></li>
</ul>
- <li><a href="http://tinkerpop.apache.org/docs/3.3.2/upgrade/#_tinkerpop_3_3_2">Upgrade Information</a></li>
+ <li><a href="http://tinkerpop.apache.org/docs/3.3.3/upgrade/#_tinkerpop_3_3_3">Upgrade Information</a></li>
<li>TinkerPop Javadoc - <a href="http://tinkerpop.apache.org/javadocs/current/core/">core</a> / <a href="http://tinkerpop.apache.org/javadocs/current/full/">full</a></li>
</ul>
</div>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d492136d/docs/site/home/template/header-footer.html
----------------------------------------------------------------------
diff --git a/docs/site/home/template/header-footer.html b/docs/site/home/template/header-footer.html
index 863c4b7..0aeb6ed 100644
--- a/docs/site/home/template/header-footer.html
+++ b/docs/site/home/template/header-footer.html
@@ -75,16 +75,16 @@ limitations under the License.
Documentation <b class="caret"></b>
</a>
<ul class="dropdown-menu">
- <li class="dropdown-header">Latest: 3.3.2 (2-Apr-2018)</li>
- <li><a href="http://tinkerpop.apache.org/docs/current">TinkerPop 3.3.2</a></li>
+ <li class="dropdown-header">Latest: 3.3.3 (8-May-2018)</li>
+ <li><a href="http://tinkerpop.apache.org/docs/current">TinkerPop 3.3.3</a></li>
<li><a href="http://tinkerpop.apache.org/docs/current/upgrade">Upgrade Information</a></li>
<li><a href="http://tinkerpop.apache.org/javadocs/current/core/">Core Javadoc API</a></li>
<li><a href="http://tinkerpop.apache.org/javadocs/current/full/">Full Javadoc API</a></li>
<li role="separator" class="divider"></li>
- <li class="dropdown-header">Maintenance: 3.2.8 (2-Apr-2018)</li>
- <li><a href="http://tinkerpop.apache.org/docs/3.2.8/">TinkerPop 3.2.8</a></li>
- <li><a href="http://tinkerpop.apache.org/javadocs/3.2.8/core/">Core Javadoc API</a></li>
- <li><a href="http://tinkerpop.apache.org/javadocs/3.2.8/full/">Full Javadoc API</a></li>
+ <li class="dropdown-header">Maintenance: 3.2.9 (8-May-2018)</li>
+ <li><a href="http://tinkerpop.apache.org/docs/3.2.9/">TinkerPop 3.2.9</a></li>
+ <li><a href="http://tinkerpop.apache.org/javadocs/3.2.9/core/">Core Javadoc API</a></li>
+ <li><a href="http://tinkerpop.apache.org/javadocs/3.2.9/full/">Full Javadoc API</a></li>
<li role="separator" class="divider"></li>
<li><a href="http://tinkerpop.apache.org/docs/">Documentation Archives</a></li>
<li><a href="http://tinkerpop.apache.org/javadocs/">Javadoc Archives</a></li>
[36/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42e509c3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42e509c3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/42e509c3
Branch: refs/heads/TINKERPOP-1956
Commit: 42e509c392b1d660801b995a4383c1f9ab41c2d4
Parents: 81ea06a 770375d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 11:52:20 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 11:52:20 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 2 +-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42e509c3/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42e509c3/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
[04/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8275e459
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8275e459
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8275e459
Branch: refs/heads/TINKERPOP-1956
Commit: 8275e45981751cdcd80d066f5d68751e7e1c7096
Parents: 99845d4 8671622
Author: Jorge Bay Gondra <jo...@gmail.com>
Authored: Wed May 2 08:50:01 2018 -0400
Committer: Jorge Bay Gondra <jo...@gmail.com>
Committed: Wed May 2 08:50:01 2018 -0400
----------------------------------------------------------------------
.../main/javascript/gremlin-javascript/index.js | 20 +++++++++++---------
.../test/unit/exports-test.js | 2 ++
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
[11/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
giraph-gremlin/pom.xml
gremlin-archetype/gremlin-archetype-dsl/pom.xml
gremlin-archetype/gremlin-archetype-server/pom.xml
gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
gremlin-archetype/pom.xml
gremlin-console/bin/gremlin.sh
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-dotnet/pom.xml
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
gremlin-dotnet/src/pom.xml
gremlin-dotnet/test/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-javascript/pom.xml
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
gremlin-python/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
gremlin-tools/gremlin-benchmark/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
pom.xml
spark-gremlin/pom.xml
tinkergraph-gremlin/pom.xml
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7b2783f4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7b2783f4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7b2783f4
Branch: refs/heads/TINKERPOP-1956
Commit: 7b2783f4acb7940c19464d758a28eaa00987ee4f
Parents: ea59446 fde136b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 8 12:03:52 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 8 12:03:52 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 17 ++++++++++++++++-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 ++--
2 files changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b2783f4/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7b2783f4/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
[17/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa5e7aff
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa5e7aff
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa5e7aff
Branch: refs/heads/TINKERPOP-1956
Commit: fa5e7affe960d762bbcb7f7d8526e13a4fa596d9
Parents: 4e3a0a9 cfbe2ce
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 10 11:28:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 10 11:28:00 2018 -0400
----------------------------------------------------------------------
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-server/src/main/static/NOTICE
----------------------------------------------------------------------
[27/50] [abbrv] tinkerpop git commit: Bump to 3.3.4-SNAPSHOT CTR
Posted by sp...@apache.org.
Bump to 3.3.4-SNAPSHOT CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/68d39dc7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/68d39dc7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/68d39dc7
Branch: refs/heads/TINKERPOP-1956
Commit: 68d39dc7dd87e162384860fd26b947b2793e23ce
Parents: 71b03ff
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri May 11 16:15:15 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 16:15:15 2018 -0400
----------------------------------------------------------------------
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 4 ++--
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/68d39dc7/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index d7bda56..772eb8e 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,8 +25,8 @@ limitations under the License.
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.3.3</Version>
- <FileVersion>3.3.3.0</FileVersion>
+ <Version>3.3.4-SNAPSHOT</Version>
+ <FileVersion>3.3.4.0</FileVersion>
<AssemblyVersion>3.3.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
<Authors>Apache TinkerPop</Authors>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/68d39dc7/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 8907fab..8e51302 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlin",
- "version": "3.3.3",
+ "version": "3.3.4-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
[41/50] [abbrv] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0b282e47
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0b282e47
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0b282e47
Branch: refs/heads/TINKERPOP-1956
Commit: 0b282e47fab2ddde978439be5831542ca26d88f4
Parents: 7158768 58d3d40
Author: davebshow <da...@gmail.com>
Authored: Mon May 14 12:43:06 2018 -0700
Committer: davebshow <da...@gmail.com>
Committed: Mon May 14 12:43:06 2018 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0b282e47/CHANGELOG.asciidoc
----------------------------------------------------------------------
[35/50] [abbrv] tinkerpop git commit: Fixed some minor asciidoc
formatting problems CTR
Posted by sp...@apache.org.
Fixed some minor asciidoc formatting problems CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/770375d4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/770375d4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/770375d4
Branch: refs/heads/TINKERPOP-1956
Commit: 770375d4dad8dd57b6265a464e9346f63083072c
Parents: 90e7476
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 11:52:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 11:52:03 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 2 +-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/770375d4/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 8631a74..37aa0df 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -34,7 +34,7 @@ execute.
IMPORTANT: The following instructions assume that the release manager's <<development-environment,environment>> is setup
properly for release and includes a `.glv` files in the various GLV modules, so that they all build in full.
-=== Development Versions
+== Development Versions
A "development version" or "snapshot" (in Java parlance) is not an "official" release. Artifacts produced for a
snapshot are solely for the convenience of providers and other developers who want to use the latest releases of
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/770375d4/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index b5eb3b3..112ce22 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -509,6 +509,8 @@ See: link:https://issues.apache.org/jira/browse/TINKERPOP-1599[TINKERPOP-1599]
IMPORTANT: It is recommended that providers also review all the upgrade instructions specified for users. Many of the
changes there may prove important for the provider's implementation.
+==== Graph Database Providers
+
===== SimplePathStep and CyclicPathStep now PathFilterStep
The Gremlin traversal machine use to support two step instructions: `SimplePathStep` and `CyclicPathStep`. These have
@@ -636,14 +638,12 @@ removed.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1562[TINKERPOP-1562]
-
==== SSL Client Authentication
Added new server configuration option `ssl.needClientAuth`.
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1602[TINKERPOP-1602]
-
=== Upgrading for Providers
IMPORTANT: It is recommended that providers also review all the upgrade instructions specified for users. Many of the
@@ -692,7 +692,6 @@ public void addHasContainer(final HasContainer hasContainer) {
See: link:https://issues.apache.org/jira/browse/TINKERPOP-1482[TINKERPOP-1482],
link:https://issues.apache.org/jira/browse/TINKERPOP-1502[TINKERPOP-1502]
-
===== Duplicate Multi-Properties
Added `supportsDuplicateMultiProperties` to `VertexFeatures` so that graph provider who only support unique values as
[14/50] [abbrv] tinkerpop git commit: CTR: Some necessary changes in
the release validation script to make it work on all systems.
Posted by sp...@apache.org.
CTR: Some necessary changes in the release validation script to make it work on all systems.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2f8f74a7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2f8f74a7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2f8f74a7
Branch: refs/heads/TINKERPOP-1956
Commit: 2f8f74a780356850cb6cb0ef6ac96e4a024a6d41
Parents: fde136b
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 8 12:43:11 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 8 12:43:11 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2f8f74a7/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index 76e0974..3622905 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -22,11 +22,7 @@
# artifacts. You must have gpg installed and must import the
# published KEYS file in order for that aspect of the validation
# to pass.
-#
-# curl -L -O https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS
-# gpg --import KEYS
-COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | grep -Po '(?<=<...@apache.org>)' | uniq)
TMP_DIR="/tmp/tpdv"
# Required. Only the latest version on each release stream is available on dist.
@@ -73,6 +69,9 @@ mkdir -p ${TMP_DIR}
rm -rf ${TMP_DIR}/*
cd ${TMP_DIR}
+COMMITTERS=$(curl -Ls https://dist.apache.org/repos/dist/dev/tinkerpop/KEYS | tee ${TMP_DIR}/KEYS | grep -Po '(?<=<...@apache.org>)' | uniq)
+gpg --import ${TMP_DIR}/KEYS 2> /dev/null && rm ${TMP_DIR}/KEYS
+
curl -Ls https://people.apache.org/keys/committer/ | grep -v invalid > ${TMP_DIR}/.committers
# validate downloads
@@ -97,7 +96,7 @@ echo "OK"
echo "* validating signatures and checksums ... "
echo -n " * PGP signature ... "
-gpg --verify ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1
+gpg --verify --with-fingerprint ${ZIP_FILENAME}.asc ${ZIP_FILENAME} > ${TMP_DIR}/.verify 2>&1
verified=0
@@ -117,11 +116,11 @@ done
[ ${verified} -eq 1 ] || { echo "failed"; exit 1; }
echo "OK"
-echo -n " * MD5 checksum ... "
-EXPECTED=`cat ${ZIP_FILENAME}.md5`
-ACTUAL=`md5sum ${ZIP_FILENAME} | awk '{print $1}'`
-[ "$ACTUAL" = "${EXPECTED}" ] || { echo "failed"; exit 1; }
-echo "OK"
+#echo -n " * MD5 checksum ... "
+#EXPECTED=`cat ${ZIP_FILENAME}.md5`
+#ACTUAL=`md5sum ${ZIP_FILENAME} | awk '{print $1}'`
+#[ "$ACTUAL" = "${EXPECTED}" ] || { echo "failed"; exit 1; }
+#echo "OK"
echo -n " * SHA1 checksum ... "
EXPECTED=`cat ${ZIP_FILENAME}.sha1`
[07/50] [abbrv] tinkerpop git commit: fix list item index: expected 2
got 1 - CTR
Posted by sp...@apache.org.
fix list item index: expected 2 got 1 - CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f64afe52
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f64afe52
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f64afe52
Branch: refs/heads/TINKERPOP-1956
Commit: f64afe52acbdafaa281f072b953a7c41d25ce800
Parents: e9ab93a
Author: Robert Dale <ro...@gmail.com>
Authored: Sun May 6 10:36:57 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sun May 6 10:37:10 2018 -0400
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f64afe52/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 86fb324..e2e3be2 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -421,7 +421,7 @@ g.V().both().both().both().count().iterate().toString() <2>
----
<1> `LazyBarrierStrategy` is a default strategy and thus, does not need to be explicitly activated.
-<1> With `LazyBarrierStrategy` activated, `barrier()` steps are automatically inserted where appropriate.
+<2> With `LazyBarrierStrategy` activated, `barrier()` steps are automatically inserted where appropriate.
*Additional References*
[12/50] [abbrv] tinkerpop git commit: Update release date for 3.3.3
and JIRAs in changelog CTR
Posted by sp...@apache.org.
Update release date for 3.3.3 and JIRAs in changelog CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d86fcc59
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d86fcc59
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d86fcc59
Branch: refs/heads/TINKERPOP-1956
Commit: d86fcc590033e4e40f791fe81a8889a928166e6f
Parents: 7b2783f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 8 12:10:33 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 8 12:10:33 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 21 ++++++++++++++++++++-
docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
2 files changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d86fcc59/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 246db49..8535bad 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -21,7 +21,7 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-mozart.png[width=185]
[[release-3-3-3]]
-=== TinkerPop 3.3.3 (Release Date: NOT OFFICIALLY RELEASED YET)
+=== TinkerPop 3.3.3 (Release Date: May 8, 2018)
This release also includes changes from <<release-3-2-9, 3.2.9>>.
@@ -30,6 +30,25 @@ This release also includes changes from <<release-3-2-9, 3.2.9>>.
* Deprecated `CredentialsGraph` DSL in favor of `CredentialsTraversalDsl` which uses the recommended method for Gremlin DSL development.
* Allowed `iterate()` to be called after `profile()`.
+==== Bugs
+
+* TINKERPOP-1869 Profile step and iterate do not play nicely with each other
+* TINKERPOP-1927 Gherkin scenario expects list with duplicates, but receives g:Set
+* TINKERPOP-1947 Path history isn't preserved for keys in mutations
+
+==== Improvements
+
+* TINKERPOP-1628 Implement TraversalSelectStep
+* TINKERPOP-1755 No docs for ReferenceElements
+* TINKERPOP-1903 Credentials DSL should use the Java annotation processor
+* TINKERPOP-1912 Remove MD5 checksums
+* TINKERPOP-1934 Bump to latest version of httpclient
+* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
+* TINKERPOP-1943 JavaScript GLV: Support GraphSON3
+* TINKERPOP-1944 JavaScript GLV: DriverRemoteConnection is not exported in the root module
+* TINKERPOP-1950 Traversal construction performance enhancements
+* TINKERPOP-1953 Bump to Groovy 2.4.15
+
[[release-3-3-2]]
=== TinkerPop 3.3.2 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d86fcc59/docs/src/upgrade/release-3.3.x.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc
index 79b7ef5..e6c15cd 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -23,7 +23,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
== TinkerPop 3.3.2
-*Release Date: NOT OFFICIALLY RELEASED YET*
+*Release Date: May 8, 2018*
Please see the link:https://github.com/apache/tinkerpop/blob/3.3.3/CHANGELOG.asciidoc#release-3-3-3[changelog] for a complete list of all the modifications that are part of this release.
[43/50] [abbrv] tinkerpop git commit: Minor updates to the release
email template CTR
Posted by sp...@apache.org.
Minor updates to the release email template CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/4adca20d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/4adca20d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/4adca20d
Branch: refs/heads/TINKERPOP-1956
Commit: 4adca20d156e0a939fa0f10edda1525cb09ea17e
Parents: 58d3d40
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 14 16:35:56 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 14 16:35:56 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/4adca20d/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 37aa0df..473e842 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -348,11 +348,11 @@ link:http://tinkerpop.apache.org/docs/current/upgrade/#_tinkerpop_3_1_0[here] in
[source,text]
----
-Subject: TinkerPop xx.yy.zz Released: [name of release line]
+Subject: Apache TinkerPop xx.yy.zz Released: [name of release line]
Hello,
-TinkerPop xx.yy.zz has just been released. [some text to introduce the release - e.g. whether or not
+Apache TinkerPop xx.yy.zz has just been released. [some text to introduce the release - e.g. whether or not
there is breaking change, an important game-changing feature or two, etc.]
The release artifacts can be found at this location:
@@ -387,7 +387,7 @@ https://www.nuget.org/packages/Gremlin.Net/xx.yy.zz
Javascript artifacts are available in npm:
-https://www.npmjs.com/package/gremlin
+https://www.npmjs.com/package/gremlin/v/xx.yy.zz
[include the release line logo image]
----
[23/50] [abbrv] tinkerpop git commit: Bumped build plugin versions to
latest.
Posted by sp...@apache.org.
Bumped build plugin versions to latest.
True of all plugins identified by the versions-maven-plugin except for the dotnet-maven-plugin which fails the build. Not sure why it fails, but I'm guessing that it has to do with some incompatibilty with dotnet command line or something. No longer need hyracs repo for anything so removed that entry from gremlin-groovy CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/3635ff69
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/3635ff69
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/3635ff69
Branch: refs/heads/TINKERPOP-1956
Commit: 3635ff69e2dfb40ec29788b426029e021a5c7f32
Parents: 8a03d50
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 8 07:32:47 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri May 11 14:11:07 2018 -0400
----------------------------------------------------------------------
.../dev/developer/development-environment.asciidoc | 3 ++-
gremlin-dotnet/pom.xml | 14 ++++++++++++--
gremlin-groovy/pom.xml | 6 ------
gremlin-javascript/pom.xml | 2 +-
pom.xml | 16 ++++++++++------
5 files changed, 25 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/docs/src/dev/developer/development-environment.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/development-environment.asciidoc b/docs/src/dev/developer/development-environment.asciidoc
index 0cceb5e..3e3edad 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -25,7 +25,7 @@ configure a development environment for TinkerPop.
== System Configuration
At a minimum, development of TinkerPop requires link:http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html[Java 1.8.0_40+]
-and link:https://maven.apache.org/download.cgi[Maven 3.0.5+]. Maven is used as the common build system, which even
+and link:https://maven.apache.org/download.cgi[Maven 3.1.0+]. Maven is used as the common build system, which even
controls the builds of non-JVM link:http://tinkerpop.apache.org/docs/current/tutorials/gremlin-language-variants/[GLVs]
such as `gremlin-python`. Java and Maven are described as a "minimum" for a development environment, because they
will only build JVM portions of TinkerPop and many integration tests will not fire with this simple setup. It is
@@ -209,6 +209,7 @@ mvn -Dmaven.javadoc.skip=true --projects tinkergraph-gremlin test
* Build JavaDocs: `mvn process-resources -Djavadoc`
* Check for Apache License headers: `mvn apache-rat:check`
* Check for newer dependencies: `mvn versions:display-dependency-updates` or `mvn versions:display-plugin-updates`
+* Check the effective `pom.xml`: `mvn -pl gremlin-python -Pglv-python help:effective-pom -Doutput=withProfilePom.xml`
* Deploy JavaDocs/AsciiDocs: `bin/publish-docs.sh svn-username`
* Integration Tests: `mvn verify -DskipIntegrationTests=false`
** Execute with the `-DincludeNeo4j` option to include transactional tests.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index fbc97d4..de41d38 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -31,14 +31,13 @@ limitations under the License.
<module>src</module>
<module>test</module>
</modules>
-
+
<build>
<plugins>
<plugin>
<groupId>org.eobjects.build</groupId>
<artifactId>dotnet-maven-plugin</artifactId>
<extensions>true</extensions>
- <version>0.14</version>
</plugin>
<plugin>
<groupId>org.codehaus.gmavenplus</groupId>
@@ -99,5 +98,16 @@ limitations under the License.
</configuration>
</plugin>
</plugins>
+ <pluginManagement>
+ <plugins>
+ <!-- bumping past 0.20 yields build errors - not sure what is amiss there -->
+ <plugin>
+ <groupId>org.eobjects.build</groupId>
+ <artifactId>dotnet-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <version>0.20</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 64405f5..3c7a122 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -88,12 +88,6 @@ limitations under the License.
<scope>test</scope>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <id>hyracks-releases</id>
- <url>http://obelix.ics.uci.edu/nexus/content/groups/hyracks-public-releases/</url>
- </repository>
- </repositories>
<build>
<directory>${basedir}/target</directory>
<finalName>${project.artifactId}-${project.version}</finalName>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index f91b749..4736576 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -169,7 +169,7 @@ limitations under the License.
<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
<executions>
<execution>
<id>install node and npm</id>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/3635ff69/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c724e0f..9737fef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -110,7 +110,7 @@ limitations under the License.
</contributor>
</contributors>
<prerequisites>
- <maven>3.0.5</maven>
+ <maven>3.1.0</maven>
</prerequisites>
<modules>
<module>gremlin-shaded</module>
@@ -172,6 +172,11 @@ limitations under the License.
<directory>${basedir}/target</directory>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
@@ -353,7 +358,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.6.1</version>
+ <version>3.7.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -370,7 +375,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.20</version>
+ <version>2.21.0</version>
<configuration>
<argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory}
-Dis.testing=true
@@ -384,7 +389,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
+ <version>2.21.0</version>
<executions>
<execution>
<id>integration-test</id>
@@ -455,7 +460,7 @@ limitations under the License.
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>3.0.2</version>
+ <version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -1332,7 +1337,6 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.17</version>
<configuration>
<argLine>-Dlog4j.configuration=${log4j-silent.properties}
-Dbuild.dir=${project.build.directory} -Dis.testing=true
[10/50] [abbrv] tinkerpop git commit: TinkerPop 3.2.9 release
Posted by sp...@apache.org.
TinkerPop 3.2.9 release
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fde136b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fde136b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fde136b1
Branch: refs/heads/TINKERPOP-1956
Commit: fde136b1dd707398803fe337344d1ba5969a66bb
Parents: f64afe5
Author: Robert Dale <ro...@gmail.com>
Authored: Tue May 8 08:48:16 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Tue May 8 08:48:16 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 17 ++++++++++++++++-
docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 ++--
giraph-gremlin/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-dsl/pom.xml | 2 +-
gremlin-archetype/gremlin-archetype-server/pom.xml | 2 +-
.../gremlin-archetype-tinkergraph/pom.xml | 2 +-
gremlin-archetype/pom.xml | 2 +-
gremlin-benchmark/pom.xml | 2 +-
gremlin-console/bin/gremlin.sh | 2 +-
gremlin-console/pom.xml | 2 +-
gremlin-core/pom.xml | 2 +-
gremlin-dotnet/pom.xml | 2 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 2 +-
gremlin-dotnet/src/pom.xml | 2 +-
gremlin-dotnet/test/pom.xml | 2 +-
gremlin-driver/pom.xml | 2 +-
gremlin-groovy-test/pom.xml | 2 +-
gremlin-groovy/pom.xml | 2 +-
gremlin-javascript/pom.xml | 2 +-
.../javascript/gremlin-javascript/package.json | 2 +-
gremlin-python/pom.xml | 2 +-
gremlin-server/pom.xml | 2 +-
gremlin-shaded/pom.xml | 2 +-
gremlin-test/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 2 +-
neo4j-gremlin/pom.xml | 2 +-
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
tinkergraph-gremlin/pom.xml | 2 +-
29 files changed, 45 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f6ca111..18f36ed 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -21,7 +21,7 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
[[release-3-2-9]]
-=== TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
+=== TinkerPop 3.2.9 (Release Date: May 8, 2018)
* Fixed bug where path history was not being preserved for keys in mutations.
* Bumped to httpclient 4.5.5.
@@ -29,6 +29,21 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Improved performance of GraphSON deserialization of `Bytecode`.
* Improved performance of traversal construction.
+==== Bugs
+
+* TINKERPOP-1947 Path history isn't preserved for keys in mutations
+
+==== Improvements
+
+* TINKERPOP-1755 No docs for ReferenceElements
+* TINKERPOP-1912 Remove MD5 checksums
+* TINKERPOP-1934 Bump to latest version of httpclient
+* TINKERPOP-1936 Performance enhancement to Bytecode deserialization
+* TINKERPOP-1944 JavaScript GLV: DriverRemoteConnection is not exported in the root module
+* TINKERPOP-1950 Traversal construction performance enhancements
+* TINKERPOP-1953 Bump to Groovy 2.4.15
+
+
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.2.x-incubating.asciidoc b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
index 51b85d3..06e4f59 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -23,9 +23,9 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
== TinkerPop 3.2.9
-*Release Date: NOT OFFICIALLY RELEASED YET*
+*Release Date: May 8, 2018*
-Please see the link:https://github.com/apache/tinkerpop/blob/3.2.8/CHANGELOG.asciidoc#release-3-2-9[changelog] for a complete list of all the modifications that are part of this release.
+Please see the link:https://github.com/apache/tinkerpop/blob/3.2.9/CHANGELOG.asciidoc#release-3-2-9[changelog] for a complete list of all the modifications that are part of this release.
=== Upgrading for Users
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 9ca6687..69355be 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>giraph-gremlin</artifactId>
<name>Apache TinkerPop :: Giraph Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 242ea07..4dd6297 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype-dsl</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 83fa7ad..eedbd56 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype-server</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index cb3b0eb..ecf5a50 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-archetype</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype-tinkergraph</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 12043c0..9f929af 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-archetype</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml
index 571bc0d..bcce1ef 100644
--- a/gremlin-benchmark/pom.xml
+++ b/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index ae28f7b..cdf1153 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.2.9-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.2.9-standalone/bin/gremlin.sh
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 51ad5ca..7581397 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<artifactId>tinkerpop</artifactId>
<groupId>org.apache.tinkerpop</groupId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-console</artifactId>
<name>Apache TinkerPop :: Gremlin Console</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index a170f8b..78bffa5 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-core</artifactId>
<name>Apache TinkerPop :: Gremlin Core</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 20b4fab..10f5791 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-dotnet</artifactId>
<name>Apache TinkerPop :: Gremlin.Net</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
index fc75b83..ad85e56 100644
--- a/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
+++ b/gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj
@@ -25,7 +25,7 @@ limitations under the License.
</PropertyGroup>
<PropertyGroup Label="Package">
- <Version>3.2.9-SNAPSHOT</Version>
+ <Version>3.2.9</Version>
<FileVersion>3.2.9.0</FileVersion>
<AssemblyVersion>3.2.0.0</AssemblyVersion>
<Title>Gremlin.Net</Title>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index aabd43b..9769b62 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-dotnet-source</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Source</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index e7e7aac..8c49ae9 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-dotnet</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-dotnet-tests</artifactId>
<name>Apache TinkerPop :: Gremlin.Net - Tests</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index cc826a5..4ba9339 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-driver</artifactId>
<name>Apache TinkerPop :: Gremlin Driver</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index a915f7d..cc21f8b 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-groovy-test</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 14efe86..627893a 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-groovy</artifactId>
<name>Apache TinkerPop :: Gremlin Groovy</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 89fb930..29da33d 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-javascript</artifactId>
<name>Apache TinkerPop :: Gremlin Javascript</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 9a6197c..aa64bfb 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,6 +1,6 @@
{
"name": "gremlin",
- "version": "3.2.9-alpha1",
+ "version": "3.2.9",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 649f3ae..8340560 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-python</artifactId>
<name>Apache TinkerPop :: Gremlin Python</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dd04865..1b38dff 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-server</artifactId>
<name>Apache TinkerPop :: Gremlin Server</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index a74a91a..f40a3ed 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-shaded</artifactId>
<name>Apache TinkerPop :: Gremlin Shaded</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 3c04c9f..66e1a3e 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>gremlin-test</artifactId>
<name>Apache TinkerPop :: Gremlin Test</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index a0f0cc7..a596db5 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>hadoop-gremlin</artifactId>
<name>Apache TinkerPop :: Hadoop Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index a65a30f..e77f83e 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>neo4j-gremlin</artifactId>
<name>Apache TinkerPop :: Neo4j Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4ec1ab4..379db49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
</parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
<packaging>pom</packaging>
<name>Apache TinkerPop</name>
<description>A Graph Computing Framework</description>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 913357c..feb339b 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>spark-gremlin</artifactId>
<name>Apache TinkerPop :: Spark Gremlin</name>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fde136b1/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index f23a716..c842275 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
<parent>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>tinkerpop</artifactId>
- <version>3.2.9-SNAPSHOT</version>
+ <version>3.2.9</version>
</parent>
<artifactId>tinkergraph-gremlin</artifactId>
<name>Apache TinkerPop :: TinkerGraph Gremlin</name>
[47/50] [abbrv] tinkerpop git commit: Fixed some bad javadoc CTR
Posted by sp...@apache.org.
Fixed some bad javadoc CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ae562c18
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ae562c18
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ae562c18
Branch: refs/heads/TINKERPOP-1956
Commit: ae562c183eee1d708759413e8c31b5db5db07295
Parents: 699a5aa
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu May 17 15:42:06 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu May 17 15:42:06 2018 -0400
----------------------------------------------------------------------
.../computer/traversal/TraversalVertexProgram.java | 17 +++++++++--------
.../traversal/dsl/graph/GraphTraversal.java | 6 +++---
2 files changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae562c18/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
index 3cb4d00..8694974 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/traversal/TraversalVertexProgram.java
@@ -63,6 +63,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMatrix;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -82,15 +83,15 @@ import java.util.List;
import java.util.Optional;
import java.util.Set;
-
/**
- * TraversalVertexProgram enables the evaluation of a {@link Traversal} on a {@link org.apache.tinkerpop.gremlin.process.computer.GraphComputer}.
- * At the start of the computation, each {@link Vertex} (or {@link org.apache.tinkerpop.gremlin.structure.Edge}) is assigned a single {@link Traverser}.
- * For each traverser that is local to the vertex, the vertex looks up its current location in the traversal and processes that step.
- * If the outputted traverser of the step references a local structure on the vertex (e.g. the vertex, an incident edge, its properties, or an arbitrary object),
- * then the vertex continues to compute the next traverser. If the traverser references another location in the graph,
- * then the traverser is sent to that location in the graph via a message. The messages of TraversalVertexProgram are traversers.
- * This continues until all traversers in the computation have halted.
+ * {@code TraversalVertexProgram} enables the evaluation of a {@link Traversal} on a {@link GraphComputer}.
+ * At the start of the computation, each {@link Vertex} (or {@link Edge}) is assigned a single {@link Traverser}.
+ * For each traverser that is local to the vertex, the vertex looks up its current location in the traversal and
+ * processes that step. If the outputted traverser of the step references a local structure on the vertex (e.g. the
+ * vertex, an incident edge, its properties, or an arbitrary object), then the vertex continues to compute the next
+ * traverser. If the traverser references another location in the graph, then the traverser is sent to that location
+ * in the graph via a message. The messages of TraversalVertexProgram are traversers. This continues until all
+ * traversers in the computation have halted.
*
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ae562c18/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index 222fdab..1dccead 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -2406,10 +2406,10 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
}
/**
- * Executes a Peer Pressure community detection algorithm over the graph.
+ * Executes an arbitrary {@link VertexProgram} over the graph.
*
- * @return the traversal with the appended {@link PeerPressureVertexProgramStep}
- * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#peerpressure-step" target="_blank">Reference Documentation - PeerPressure Step</a>
+ * @return the traversal with the appended {@link ProgramVertexProgramStep}
+ * @see <a href="http://tinkerpop.apache.org/docs/${project.version}/reference/#program-step" target="_blank">Reference Documentation - Program Step</a>
* @since 3.2.0-incubating
*/
public default GraphTraversal<S, E> program(final VertexProgram<?> vertexProgram) {