[19/31] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/00f77fad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00f77fad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00f77fad

Branch: refs/heads/TINKERPOP-1975
Commit: 00f77fad23f22c79014a2da8343e5f59e6a6f167
Parents: 31a3b44 c2ff47c
Author: Stephen Mallette 
Authored: Mon Jun 4 13:28:49 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:28:49 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00f77fad/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00f77fad/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

[13/31] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection to root pom.xml

2018-06-04 Thread spmallette 
TINKERPOP-1897 Move snapshot detection to root pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd115177
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177

Branch: refs/heads/TINKERPOP-1975
Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7
Parents: c125fc9
Author: Florian Hockmann 
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 25 +
 gremlin-server/pom.xml  | 25 +
 pom.xml | 29 -
 3 files changed, 26 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+3.0.0
+
+
+
+
+build-helper-regex-is-snapshot-used
+validate
+
+regex-property
+
+
+only.when.is.snapshot.used
+${project.version}
+.*-SNAPSHOT
+true
+false
+
+
+
+
+
 org.apache.maven.plugins
 maven-jar-plugin
 3.0.2
@@ -502,11 +526,6 @@

[20/31] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9eac7f70
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9eac7f70
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9eac7f70

Branch: refs/heads/TINKERPOP-1975
Commit: 9eac7f705eddd926f962151993a7a2d73a5748e4
Parents: b0a68b8 00f77fa
Author: Stephen Mallette 
Authored: Mon Jun 4 13:28:58 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:28:58 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eac7f70/docs/src/reference/gremlin-applications.asciidoc
--

[09/31] tinkerpop git commit: Remove verbose log output TINKERPOP-1897

2018-06-04 Thread spmallette 
Remove verbose log output TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47f3c1cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47f3c1cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47f3c1cc

Branch: refs/heads/TINKERPOP-1975
Commit: 47f3c1ccd697546ab2e5fd8d3c48904f53da1551
Parents: b829153
Author: Florian Hockmann 
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .../src/reference/gremlin-applications.asciidoc | 26 +---
 1 file changed, 1 insertion(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47f3c1cc/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 80659af..e0896ef 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1946,31 +1946,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 -oOOo-(3)-oOOo-
 
 [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with 
report interval=18ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report 
interval=18ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= 
and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with 
interval=18ms and 
loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via 
[conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool.  Threads in 
pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with 
scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing 
GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine 
and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with 
graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with 
size 1000 and expiration time of 60 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured 
application/vnd.gremlin-v1.0+gryo-stringd with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
 [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
 [INFO] GremlinServer$1 - Channel started at port 8182.

[11/31] tinkerpop git commit: Add clarification for Docker image releases TINKERPOP-1897

2018-06-04 Thread spmallette 
Add clarification for Docker image releases TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80931cee
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80931cee
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80931cee

Branch: refs/heads/TINKERPOP-1975
Commit: 80931cee80613c1f910f26c6ceeb25bcf796cd83
Parents: e3c6dde
Author: Florian Hockmann 
Authored: Wed May 23 18:30:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/development-environment.asciidoc | 8 +---
 docs/src/dev/developer/release.asciidoc | 5 +
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/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 c50b189..cb20d4e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,9 +197,11 @@ authentication information on the ~/.npmrc file. The 
easiest way to do that is t
 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.
 
-Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
-`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
-credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
an account that is a member of the TinkerPop
+organization. So if you don't already have an account on Docker Hub then 
create one and request that
+a PMC member adds your account to the TinkerPop organization. Afterwards, 
authentication information needs to be added to
+the `~/.docker/config.json` file. This information can simply be added with 
the `docker login` command which will ask for
+credentials. This must be done only once. Finally, `docker push` can be used 
to push images to Docker Hub which will
 be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
 
 [[building-testing]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 473e842..7963004 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -233,6 +233,11 @@ for generating javadoc and without that the binary 
distributions won't contain t
 .. `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]
+. Deploy the Docker images
+.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+. Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
+and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `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`.

[29/31] tinkerpop git commit: TINKERPOP-1897 Add latest tag for docker images CTR

2018-06-04 Thread spmallette 
TINKERPOP-1897 Add latest tag for docker images CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d4faa660
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d4faa660
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d4faa660

Branch: refs/heads/TINKERPOP-1975
Commit: d4faa6605495e072d65578682d2ed5fd12bdb5ad
Parents: 055f1d5
Author: Florian Hockmann 
Authored: Mon Jun 4 20:56:04 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:56:04 2018 +0200

--
 gremlin-console/pom.xml | 21 +
 gremlin-server/pom.xml  | 21 +
 2 files changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4faa660/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b933bf8..d9fc35f 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -383,6 +383,16 @@ limitations under the License.
 
 
 
+docker-image-tag-latest
+
+tag
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
+
 docker-image-push
 deploy
 
@@ -404,6 +414,17 @@ limitations under the License.
 
${only.when.is.prerelease.version}
 
 
+
+docker-image-push-latest
+deploy
+
+push
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
 
 
 tinkerpop/gremlin-console

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4faa660/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 7b20c69..01d5f3e 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -293,6 +293,16 @@ limitations under the License.
 
 
 
+docker-image-tag-latest
+
+tag
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
+
 docker-image-push
 deploy
 
@@ -314,6 +324,17 @@ limitations under the License.
 
${only.when.is.prerelease.version}
 
 
+
+docker-image-push-latest
+deploy
+
+push
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
 
 
 tinkerpop/gremlin-server

[17/31] tinkerpop git commit: Minor doc updates around docker CTR

2018-06-04 Thread spmallette 
Minor doc updates around docker CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c2ff47ca
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2ff47ca
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c2ff47ca

Branch: refs/heads/TINKERPOP-1975
Commit: c2ff47ca5ff5dc4a6bef82f9ac1da3b24ff24d7f
Parents: 6f6d941
Author: Stephen Mallette 
Authored: Mon Jun 4 10:56:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 10:56:20 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2ff47ca/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 273e5c7..f044df8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -355,6 +355,7 @@ Like, execution mode, it is also possible to pass multiple 
scripts by specifying
 
 [[gremlin-console-docker-image]]
 === Docker Image
+
 The Gremlin Console can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
 
 [source,text]
@@ -1935,6 +1936,7 @@ immediately forget the script after execution. In this 
way, the function does no
 
 [[gremlin-server-docker-image]]
 === Docker Image
+
 The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
 
 [source,text]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2ff47ca/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 ccdf51a..593c631 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,21 @@ Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.as
 
 === Upgrading for Users
 
+ Docker Images
+
+Docker images are now available on 
link:https://hub.docker.com/u/tinkerpop/[Docker Hub] for Gremlin Console and 
Gremlin
+Server.
+
+[source,text]
+
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+$ docker run tinkerpop/gremlin-server:x.y.z
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1897[TINKERPOP-1897],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-console-docker-image[Reference
 Documentation - Gremlin Console],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-server-docker-image[Reference
 Documentation - Gremlin Server],
+
  TinkerFactory.createGratefulDead()
 
 The Grateful Dead dataset has been with TinkerPop since the early days of 1.x. 
It has always been available as a

[27/31] tinkerpop git commit: TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

2018-06-04 Thread spmallette 
TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

Tags like 3.2 should only point to stable releases.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aac534e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aac534e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aac534e1

Branch: refs/heads/TINKERPOP-1975
Commit: aac534e11fa406bedc61dbc060d06740b898e170
Parents: 144c698
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:00 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:00 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 29df2a4..8a4a12c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -379,7 +379,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -401,7 +401,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index a75b6c5..517f029 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -287,7 +287,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -309,7 +309,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f2484f8..a9be62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,22 @@ limitations under the License.
 
 
 
+
+build-helper-regex-is-prerelease-version
+validate
+
+regex-property
+
+
+only.when.is.prerelease.version
+${project.version}
+.*-.*
+true
+false
+
+
+
 parse-version
 
 parse-version

[15/31] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/31a3b444
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31a3b444
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31a3b444

Branch: refs/heads/TINKERPOP-1975
Commit: 31a3b444ec290b3868337edb664348efbbd567ee
Parents: f2e74ff 6f6d941
Author: Florian Hockmann 
Authored: Mon Jun 4 16:05:04 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 16:05:04 2018 +0200

--
 .dockerignore   |  2 +
 CHANGELOG.asciidoc  |  2 +-
 docker/hadoop/Dockerfile| 25 
 .../developer/development-environment.asciidoc  | 22 ++-
 docs/src/dev/developer/release.asciidoc |  8 ++-
 .../src/reference/gremlin-applications.asciidoc | 65 
 gremlin-console/Dockerfile  | 31 ++
 gremlin-console/pom.xml | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 24 
 .../gremlin/driver/ResultQueueTest.java |  2 +-
 gremlin-server/Dockerfile   | 35 +++
 gremlin-server/pom.xml  | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 31 ++
 pom.xml | 35 +++
 14 files changed, 406 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/development-environment.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/release.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 26ec185,273e5c7..bf0875a
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -2080,9 -1930,42 +2112,42 @@@ $ curl -X POST -d "{\"gremlin\":\"divid
  {"message":"Error encountered evaluating script: divideIt(8, 2)"}
  
  
 -In the above REST-based requests, the bindings contain a special parameter 
that tells the `ScriptEngine` cache to
 +In the above HTTP-based requests, the bindings contain a special parameter 
that tells the `ScriptEngine` cache to
  immediately forget the script after execution. In this way, the function does 
not end up being globally available.
  
+ [[gremlin-server-docker-image]]
+ === Docker Image
+ The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+ 
+ [source,text]
+ 
+ $ docker run tinkerpop/gremlin-server:x.y.z
+ [INFO] GremlinServer - 
+  \,,,/
+  (o o)
+ -oOOo-(3)-oOOo-
+ 
+ [INFO] GremlinServer - Configuring Gremlin Server from 
conf/gremlin-server.yaml
+ ...
+ [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
+ [INFO] GremlinServer$1 - Channel started at port 8182.
+ 
+ 
+ By default, Gremlin Server listens on port 8182. So that port needs to be 
exposed if it should be reachable on the host:
+ 
+ [source,bash]
+ 
+ $ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+ 
+ 
+ Arguments provided with `docker run` are forwarded to the script that starts 
Gremlin Server. This allows for example
+ to use an alternative config file:
+ 
+ [source,bash]
+ 
+ $ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+ 
+ 
  [[gremlin-plugins]]
  == Gremlin Plugins
  

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/pom.xml
--

[1/2] tinkerpop git commit: Removed a dead bit of code

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 d4faa6605 -> d7b756b16


Removed a dead bit of code

Looks like a half-finished step of some sort. Had no connection to anything CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/962093e6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/962093e6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/962093e6

Branch: refs/heads/tp33
Commit: 962093e66f6ae4266cd7604482c1bcb75428ad5f
Parents: aac534e
Author: Stephen Mallette 
Authored: Mon Jun 4 17:03:32 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 17:03:32 2018 -0400

--
 .../traversal/step/map/PropertyElementStep.java | 48 
 1 file changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/962093e6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
deleted file mode 100644
index 6c8489a..000
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class PropertyElementStep extends MapStep, 
Element> {
-
-public PropertyElementStep(final Traversal.Admin traversal) {
-super(traversal);
-}
-
-@Override
-protected Element map(final Traverser.Admin> traverser) {
-return traverser.get().element();
-}
-
-@Override
-public Set getRequirements() {
-return Collections.singleton(TraverserRequirement.OBJECT);
-}
-}

[1/3] tinkerpop git commit: Removed a dead bit of code

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/master d7843fea0 -> 0e1730406


Removed a dead bit of code

Looks like a half-finished step of some sort. Had no connection to anything CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/962093e6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/962093e6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/962093e6

Branch: refs/heads/master
Commit: 962093e66f6ae4266cd7604482c1bcb75428ad5f
Parents: aac534e
Author: Stephen Mallette 
Authored: Mon Jun 4 17:03:32 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 17:03:32 2018 -0400

--
 .../traversal/step/map/PropertyElementStep.java | 48 
 1 file changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/962093e6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
deleted file mode 100644
index 6c8489a..000
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class PropertyElementStep extends MapStep, 
Element> {
-
-public PropertyElementStep(final Traversal.Admin traversal) {
-super(traversal);
-}
-
-@Override
-protected Element map(final Traverser.Admin> traverser) {
-return traverser.get().element();
-}
-
-@Override
-public Set getRequirements() {
-return Collections.singleton(TraverserRequirement.OBJECT);
-}
-}

tinkerpop git commit: Removed a dead bit of code

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 aac534e11 -> 962093e66


Removed a dead bit of code

Looks like a half-finished step of some sort. Had no connection to anything CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/962093e6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/962093e6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/962093e6

Branch: refs/heads/tp32
Commit: 962093e66f6ae4266cd7604482c1bcb75428ad5f
Parents: aac534e
Author: Stephen Mallette 
Authored: Mon Jun 4 17:03:32 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 17:03:32 2018 -0400

--
 .../traversal/step/map/PropertyElementStep.java | 48 
 1 file changed, 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/962093e6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
deleted file mode 100644
index 6c8489a..000
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PropertyElementStep.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tinkerpop.gremlin.process.traversal.step.map;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.structure.Element;
-import org.apache.tinkerpop.gremlin.structure.Property;
-
-import java.util.Collections;
-import java.util.Set;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class PropertyElementStep extends MapStep, 
Element> {
-
-public PropertyElementStep(final Traversal.Admin traversal) {
-super(traversal);
-}
-
-@Override
-protected Element map(final Traverser.Admin> traverser) {
-return traverser.get().element();
-}
-
-@Override
-public Set getRequirements() {
-return Collections.singleton(TraverserRequirement.OBJECT);
-}
-}

[3/3] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0e173040
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0e173040
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0e173040

Branch: refs/heads/master
Commit: 0e17304063078df378c62c4596edb1de3ffa1524
Parents: d7843fe d7b756b
Author: Stephen Mallette 
Authored: Mon Jun 4 17:04:28 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 17:04:28 2018 -0400

--
 .../traversal/step/map/PropertyElementStep.java | 48 
 1 file changed, 48 deletions(-)
--

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/d7b756b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7b756b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d7b756b1

Branch: refs/heads/tp33
Commit: d7b756b164c3d063741d2ea9d39d710d3bf7aadd
Parents: d4faa66 962093e
Author: Stephen Mallette 
Authored: Mon Jun 4 17:04:19 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 17:04:19 2018 -0400

--
 .../traversal/step/map/PropertyElementStep.java | 48 
 1 file changed, 48 deletions(-)
--

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/d7b756b1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7b756b1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d7b756b1

Branch: refs/heads/master
Commit: d7b756b164c3d063741d2ea9d39d710d3bf7aadd
Parents: d4faa66 962093e
Author: Stephen Mallette 
Authored: Mon Jun 4 17:04:19 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 17:04:19 2018 -0400

--
 .../traversal/step/map/PropertyElementStep.java | 48 
 1 file changed, 48 deletions(-)
--

[31/31] tinkerpop git commit: TINKERPOP-1975 Introduced with() step and Configuring interface

2018-06-04 Thread spmallette 
TINKERPOP-1975 Introduced with() step and Configuring interface

Moved Parameterizing to the package containing the other step interfaces. 
Changed interface hierarchy with Parameterizing and Mutating now that 
Configuring is present. Both of those changes make this body of work a breaking 
change to existing APIs though it should really only affect graph providers and 
even then the fix is quite simple as described in the upgrade documentation.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0dca3ff9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0dca3ff9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0dca3ff9

Branch: refs/heads/TINKERPOP-1975
Commit: 0dca3ff9d2f78e145a807e28fd58c1a0cf452cb6
Parents: d7843fe
Author: Stephen Mallette 
Authored: Thu May 31 12:55:13 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 16:44:41 2018 -0400

--
 CHANGELOG.asciidoc  |  4 ++
 docs/src/reference/the-traversal.asciidoc   | 30 ++--
 docs/src/upgrade/release-3.4.x.asciidoc | 49 +
 .../tinkerpop/gremlin/jsr223/CoreImports.java   |  2 +
 .../step/map/PageRankVertexProgramStep.java | 75 ++--
 .../step/map/PeerPressureVertexProgramStep.java | 74 +--
 .../process/traversal/Parameterizing.java   | 37 --
 .../traversal/dsl/graph/GraphTraversal.java | 24 ++-
 .../process/traversal/step/Configuring.java | 41 +++
 .../process/traversal/step/Mutating.java|  5 +-
 .../process/traversal/step/Parameterizing.java  | 39 ++
 .../process/traversal/step/filter/DropStep.java |  9 ++-
 .../traversal/step/map/AddEdgeStartStep.java|  6 +-
 .../process/traversal/step/map/AddEdgeStep.java |  7 +-
 .../traversal/step/map/AddVertexStartStep.java  |  7 +-
 .../traversal/step/map/AddVertexStep.java   |  6 +-
 .../traversal/step/map/EdgeOtherVertexStep.java | 15 +++-
 .../traversal/step/map/EdgeVertexStep.java  | 15 +++-
 .../process/traversal/step/map/GraphStep.java   | 15 +++-
 .../traversal/step/map/PropertiesStep.java  | 15 +++-
 .../process/traversal/step/map/VertexStep.java  | 15 +++-
 .../step/sideEffect/AddPropertyStep.java|  9 +--
 .../process/traversal/step/util/Parameters.java |  2 +
 .../strategy/decoration/ElementIdStrategy.java  |  2 +-
 .../strategy/decoration/PartitionStrategy.java  |  6 +-
 .../traversal/dsl/graph/GraphTraversalTest.java |  2 +-
 .../Process/Traversal/GraphTraversal.cs |  4 +-
 gremlin-javascript/glv/generate.groovy  |  3 +-
 .../lib/process/graph-traversal.js  |  2 +-
 gremlin-python/glv/generate.groovy  |  1 +
 .../gremlin_python/process/graph_traversal.py   |  2 +-
 .../traversal/step/map/PageRankTest.java| 41 +++
 .../traversal/step/map/PeerPressureTest.java| 31 +++-
 33 files changed, 496 insertions(+), 99 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0dca3ff9/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 14b084c..15e12fd 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,10 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 This release also includes changes from <>.
 
+* Moved `Parameterizing` interface to the 
`org.apache.tinkerpop.gremlin.process.traversal.step` package with other marker 
interfaces of its type.
+* Replaced `Parameterizing.addPropertyMutations()` with 
`Configuring.configure()`.
+* Changed interface hierarchy for `Parameterizing` and `Mutating` interfaces 
as they are tightly related.
+* Introduced the `with()` step modulator which can supply configuration 
options to `Configuring` steps.
 * Added `supportsUpsert()` option to `VertexFeatures` and `EdgeFeatures`.
 * `min()` and `max()` now support all types implementing `Comparable`.
 * Change the `toString()` of `Path` to be standardized as other graph elements 
are.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0dca3ff9/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc 
b/docs/src/reference/the-traversal.asciidoc
index b3e5ef5..0d7d67f 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -1705,11 +1705,15 @@ g = graph.traversal().withComputer()
 g.V().pageRank().by('pageRank').values('pageRank')
 g.V().hasLabel('person').
   pageRank().
-by(outE('knows')).
-by('friendRank').
+with(PageRank.EDGES, __.outE('knows')).
+with(PageRank.PROPERTY_NAME, 'friendRank').

[21/31] tinkerpop git commit: Minor doc updates around docker CTR

2018-06-04 Thread spmallette 
Minor doc updates around docker CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/57ac99ec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/57ac99ec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/57ac99ec

Branch: refs/heads/TINKERPOP-1975
Commit: 57ac99ec7d489e480fb73fa72ae544af130b76ae
Parents: 1c3f34f
Author: Stephen Mallette 
Authored: Mon Jun 4 10:56:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:31 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 273e5c7..f044df8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -355,6 +355,7 @@ Like, execution mode, it is also possible to pass multiple 
scripts by specifying
 
 [[gremlin-console-docker-image]]
 === Docker Image
+
 The Gremlin Console can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
 
 [source,text]
@@ -1935,6 +1936,7 @@ immediately forget the script after execution. In this 
way, the function does no
 
 [[gremlin-server-docker-image]]
 === Docker Image
+
 The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
 
 [source,text]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/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 ccdf51a..593c631 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,21 @@ Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.as
 
 === Upgrading for Users
 
+ Docker Images
+
+Docker images are now available on 
link:https://hub.docker.com/u/tinkerpop/[Docker Hub] for Gremlin Console and 
Gremlin
+Server.
+
+[source,text]
+
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+$ docker run tinkerpop/gremlin-server:x.y.z
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1897[TINKERPOP-1897],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-console-docker-image[Reference
 Documentation - Gremlin Console],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-server-docker-image[Reference
 Documentation - Gremlin Server],
+
  TinkerFactory.createGratefulDead()
 
 The Grateful Dead dataset has been with TinkerPop since the early days of 1.x. 
It has always been available as a

[24/31] tinkerpop git commit: Need one execution per version to get both docker images to deploy

2018-06-04 Thread spmallette 
Need one execution per version to get both docker images to deploy

Given this https://github.com/spotify/dockerfile-maven/issues/10 CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/144c6980
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/144c6980
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/144c6980

Branch: refs/heads/TINKERPOP-1975
Commit: 144c69801de8135ac04663da4063260378c71336
Parents: 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:49:34 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:49:34 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 748360c..29df2a4 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -384,10 +384,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0d68e7b..a75b6c5 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -292,10 +292,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}

[30/31] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d7843fea
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7843fea
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d7843fea

Branch: refs/heads/TINKERPOP-1975
Commit: d7843fea02a46423e06f8a2ff3e6a0f72cfb7c57
Parents: 7702b4b d4faa66
Author: Florian Hockmann 
Authored: Mon Jun 4 20:56:26 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:56:26 2018 +0200

--
 gremlin-console/pom.xml | 25 +++--
 gremlin-server/pom.xml  | 25 +++--
 pom.xml | 16 
 3 files changed, 62 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7843fea/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7843fea/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7843fea/pom.xml
--

[16/31] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b0a68b8c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b0a68b8c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b0a68b8c

Branch: refs/heads/TINKERPOP-1975
Commit: b0a68b8c04b3634d05abcecf6935d0626f7b6969
Parents: 8dba889 31a3b44
Author: Florian Hockmann 
Authored: Mon Jun 4 16:05:13 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 16:05:13 2018 +0200

--
 .dockerignore   |  2 +
 CHANGELOG.asciidoc  |  2 +-
 docker/hadoop/Dockerfile| 25 
 .../developer/development-environment.asciidoc  | 22 ++-
 docs/src/dev/developer/release.asciidoc |  8 ++-
 .../src/reference/gremlin-applications.asciidoc | 65 
 gremlin-console/Dockerfile  | 31 ++
 gremlin-console/pom.xml | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 24 
 .../gremlin/driver/ResultQueueTest.java |  2 +-
 gremlin-server/Dockerfile   | 35 +++
 gremlin-server/pom.xml  | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 31 ++
 pom.xml | 35 +++
 14 files changed, 406 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/pom.xml
--

[23/31] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/83640471
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/83640471
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/83640471

Branch: refs/heads/TINKERPOP-1975
Commit: 8364047117bd6080cfe8184faafacf4ee7166113
Parents: 9eac7f7 edc0a46
Author: Stephen Mallette 
Authored: Mon Jun 4 13:30:57 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:57 2018 -0400

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[14/31] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm artifact deployment in that profile.

2018-06-04 Thread spmallette 
TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm 
artifact deployment in that profile.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f6d9417
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f6d9417
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f6d9417

Branch: refs/heads/TINKERPOP-1975
Commit: 6f6d9417a4c938f42b8260b8bd5328d147106a0e
Parents: 8232158
Author: Stephen Mallette 
Authored: Mon Jun 4 09:26:22 2018 -0400
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:30 2018 +0200

--
 .../developer/development-environment.asciidoc|  9 +
 docs/src/dev/developer/release.asciidoc   |  6 +++---
 gremlin-console/pom.xml   | 18 +-
 gremlin-server/pom.xml| 18 +-
 4 files changed, 42 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/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 ae97d1a..6b1dbd6 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -129,15 +129,16 @@ See the <> 
section for more information
 
 [[docker-environment]]
 === Docker Environment
-The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
 
-The Docker images can be built from the command line with:
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console. The Docker images
+can be built from the command line with:
+
 [source,text]
 
-mvn clean install -Pdocker-images
+mvn clean install -pl gremlin-server,gremlin-console -DdockerImages
 
-which enables the "docker-images" Maven profile.
 
+which enables the "docker-images" Maven profile.
 
 [[release-environment]]
 === Release Environment

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index eef4e3f..5496b31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,7 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -DdockerImages`
 .. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
@@ -235,8 +235,8 @@ for generating javadoc and without that the binary 
distributions won't contain t
 . 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]
 . Deploy the Docker images
-.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
-.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-console -DskipTests -DdockerImages`
+.. `mvn deploy -pl gremlin-server -DskipTests -DdockerImages`
 . Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
 and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; 
svn up dev/xx.yy.zz`

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b5dca0e..748360c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,8 +338,24 @@ limitations under the License.
 
 
 docker-images
+
+false
+
+dockerImages
+
+
 
-
+
+
+
+org.apache.maven.plugins
+

[18/31] tinkerpop git commit: Make docker-entrypoint.sh scripts executable TINKERPOP-1897

2018-06-04 Thread spmallette 
Make docker-entrypoint.sh scripts executable TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c3f34f5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c3f34f5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c3f34f5

Branch: refs/heads/TINKERPOP-1975
Commit: 1c3f34f52b2651897aa2fe89527cae8d2357dcc6
Parents: 6f6d941
Author: Florian Hockmann 
Authored: Mon Jun 4 19:12:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 19:12:53 2018 +0200

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-console/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh 
b/gremlin-console/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-server/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh 
b/gremlin-server/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

[28/31] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/055f1d5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/055f1d5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/055f1d5e

Branch: refs/heads/TINKERPOP-1975
Commit: 055f1d5ee33c6f0f49267ef48365eff9f0d0bafa
Parents: ee65d5f aac534e
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:28 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:28 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/pom.xml
--

[25/31] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/ee65d5f2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ee65d5f2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ee65d5f2

Branch: refs/heads/TINKERPOP-1975
Commit: ee65d5f2ba191b65a383282695074bac38a4d885
Parents: edc0a46 144c698
Author: Stephen Mallette 
Authored: Mon Jun 4 13:57:22 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:57:22 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-server/pom.xml
--

[01/31] tinkerpop git commit: Updated BlazeGraph to Neptune and dropped Titan. CTR [Forced Update!]

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1975 fc0b2dc5c -> 0dca3ff9d (forced update)


Updated BlazeGraph to Neptune and dropped Titan. CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8dba8893
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8dba8893
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8dba8893

Branch: refs/heads/TINKERPOP-1975
Commit: 8dba8893acb766a81b0af1297913b7936e388daf
Parents: 23b766a
Author: Stephen Mallette 
Authored: Mon Jun 4 07:42:39 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 07:42:39 2018 -0400

--
 docs/site/home/img/logos/neptune-logo.png | Bin 0 -> 207133 bytes
 docs/site/home/providers.html |  15 ---
 2 files changed, 4 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8dba8893/docs/site/home/img/logos/neptune-logo.png
--
diff --git a/docs/site/home/img/logos/neptune-logo.png 
b/docs/site/home/img/logos/neptune-logo.png
new file mode 100644
index 000..db44a9c
Binary files /dev/null and b/docs/site/home/img/logos/neptune-logo.png differ

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8dba8893/docs/site/home/providers.html
--
diff --git a/docs/site/home/providers.html b/docs/site/home/providers.html
index 6738831..474d6f1 100644
--- a/docs/site/home/providers.html
+++ b/docs/site/home/providers.html
@@ -124,8 +124,8 @@ limitations under the License.
   
   
  
-http://blazegraph.com/;>
-http://blazegraph.com/;>Blazegraph is a 
standards-based, high-performance, scalable, open-source graph database. 
Written entirely in Java, the platform supports Apache TinkerPop and RDF/SPARQL 
1.1 family of specifications.  A commercial version includes GPU acceleration.
+https://aws.amazon.com/neptune/;>
+https://aws.amazon.com/neptune/;>Amazon Neptune is a 
fast, reliable, fully-managed graph database service that makes it easy to 
build and run applications that work with highly connected datasets.
  
  
 https://docs.microsoft.com/en-us/azure/cosmos-db/graph-introduction;>
@@ -183,15 +183,8 @@ limitations under the License.
http://stardog.com/;>Stardog is a graph 
database optimized for enterprise data unification. It supports both semantic 
graphs, via RDF, SPARQL, and OWL, as well as property graphs via Apache 
TinkerPop and Gremlin--it's the only graph database that supports both models 
over the same database, simultaneously. Stardog also supports hybrid data 
unification architectures, seamlessly blending data warehouse, system of 
record, and virtual query strategies. Stardog is suited for enterprise data 
silo challenges.
  
  
-   http://titan.thinkaurelius.com/;>
-   http://titan.thinkaurelius.com/;>Titan is an 
Apache2 licensed scalable, distributed graph database optimized for storing and 
querying graphs containing hundreds of billions of vertices and edges 
distributed across a multi-machine cluster. Titan is a transactional database 
that can support thousands of concurrent users executing complex Gremlin 
traversals in real time. Titan also provides an in-memory, compression-based 
OLAP processor as well as integrates with Apache TinkerPop's Spark OLAP 
processors.
- 
-  
-  
-  
- 
-   http://tomsawyer.com/products/perspectives/;>
-   http://tomsawyer.com/products/perspectives/;>Tom Sawyer 
Perspectives is advanced graphics-based software for building 
enterprise-class data relationship visualization and analysis applications. It 
is a complete Software Development Kit (SDK) with a graphics-based design and 
preview environment. Tom Sawyer Perspectives combines visualization, layout, 
and analysis technology with an elegant platform architecture. Tom Sawyer 
Perspectives enables interaction with graph database systems via Apache 
TinkerPop.
+http://tomsawyer.com/products/perspectives/;>
+http://tomsawyer.com/products/perspectives/;>Tom Sawyer 
Perspectives is advanced graphics-based software for building 
enterprise-class data relationship visualization and analysis applications. It 
is a complete Software Development Kit (SDK) with a graphics-based design and 
preview environment. Tom Sawyer Perspectives combines visualization, layout, 
and analysis technology with an elegant platform architecture. Tom Sawyer 
Perspectives enables interaction with graph database systems via Apache 
TinkerPop.

[07/31] tinkerpop git commit: TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions

2018-06-04 Thread spmallette 
TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions

This also adds the minor version as an additional tag for Docker images
when the version is not a SNAPSHOT version.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9c3d0f00
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9c3d0f00
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9c3d0f00

Branch: refs/heads/TINKERPOP-1975
Commit: 9c3d0f00fd77a80ba9f5df4eb49b850110adb4e7
Parents: 5d2faa2
Author: Florian Hockmann 
Authored: Wed Mar 14 22:41:55 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 61 +---
 gremlin-server/pom.xml  | 53 ++
 pom.xml |  5 
 3 files changed, 105 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b7933fb..b24c772 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -347,23 +347,66 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+
+
+build-helper-regex-is-snapshot-used
+validate
+
+regex-property
+
+
+only.when.is.snapshot.used
+${project.version}
+.*-SNAPSHOT
+true
+false
+
+
+
+
+
 com.spotify
 dockerfile-maven-plugin
 
 
-docker-image
-
-build
-push
-
+docker-image-build
+
+build
+
+
+${project.version}
+
+
target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone
+
+
+
+
+docker-image-tag-minor-version
+
+tag
+
+
 
+3.2
+${only.when.is.snapshot.used} 

+
+
+
+docker-image-push
+
+push
+
+

+${only.when.is.snapshot.used}
+   
 
 
 
 
 tinkerpop/gremlin-console
-${project.version}
-
-
target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone
-
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dfc6570..e71f79b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -255,23 +255,66 @@ limitations under the License.
 
 
 
+

[03/31] tinkerpop git commit: Don't build docker images in docker build TINKERPOP-1897

2018-06-04 Thread spmallette 
Don't build docker images in docker build TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a5f1f74a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a5f1f74a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a5f1f74a

Branch: refs/heads/TINKERPOP-1975
Commit: a5f1f74a42649275fa35157f9072b5aa5e7c7748
Parents: 5ac7816
Author: Florian Hockmann 
Authored: Mon Feb 26 21:17:46 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:28 2018 +0200

--
 docker/scripts/build.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a5f1f74a/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 5ef74fc..3d8f0d3 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,6 +67,9 @@ touch gremlin-python/.glv
 touch gremlin-dotnet/src/.glv
 touch gremlin-dotnet/test/.glv
 
+rm gremlin-console/.docker
+rm gremlin-server/.docker
+
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then
   echo "Copying settings.xml"

[04/31] tinkerpop git commit: Add docker images for console and server TINKERPOP-1897

2018-06-04 Thread spmallette 
Add docker images for console and server TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ac78169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ac78169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ac78169

Branch: refs/heads/TINKERPOP-1975
Commit: 5ac78169ccd7c6674343204fa22e1af83d2fddcc
Parents: 1a0947b
Author: Florian Hockmann 
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:28 2018 +0200

--
 .dockerignore   |  2 +
 .gitignore  |  1 +
 CHANGELOG.asciidoc  |  2 +-
 .../developer/development-environment.asciidoc  | 16 +++-
 .../src/reference/gremlin-applications.asciidoc | 89 
 gremlin-console/Dockerfile  | 31 +++
 gremlin-console/pom.xml | 34 
 .../src/main/docker/docker-entrypoint.sh| 24 ++
 gremlin-server/Dockerfile   | 35 
 gremlin-server/pom.xml  | 34 
 .../src/main/docker/docker-entrypoint.sh| 31 +++
 pom.xml |  6 ++
 12 files changed, 303 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.dockerignore
--
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
 **/*.log
 **/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
 *.iml
 .idea
 **/*.DS_Store

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
+.docker
 settings.xml
 tools/
 [Dd]ebug/

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6297210..a1d0963 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
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)
 
+* Added Docker images for Gremlin Console and Gremlin Server
 * Fixed bug in `branch()` where reducing steps as options would produce 
incorrect results.
 * Removed recursive handling of streaming results from Gremlin-Python driver 
to avoid max recursion depth errors.
 * Improved performance of `TraversalVertexProgram` and related infrastructure.
@@ -56,7 +57,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * 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/5ac78169/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 4dfbcaa..cb19a65 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -106,7 +106,7 @@ The build optionally requires 
link:https://www.microsoft.com/net/core[.NET Core
 `gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will 
still build with Maven, but .NET projects
 will be skipped.
 
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
 
 [source,text]
 mvn clean install -Pgremlin-dotnet
@@ -127,6 +127,20 @@ other existing Node.js runtime instances in your machine.
 
 See the <> section for more 
information on release manager configurations.
 
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+
+mvn clean install -Pdocker-images
+
+which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
+in the

[26/31] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7702b4b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7702b4b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7702b4b8

Branch: refs/heads/TINKERPOP-1975
Commit: 7702b4b83cc8fba8b806d269f879f3b791be30c6
Parents: 8364047 ee65d5f
Author: Stephen Mallette 
Authored: Mon Jun 4 13:57:32 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:57:32 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7702b4b8/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7702b4b8/gremlin-server/pom.xml
--

[12/31] tinkerpop git commit: Replace hardcoded version tags by parsed version TINKERPOP-1897

2018-06-04 Thread spmallette 
Replace hardcoded version tags by parsed version TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c6ddeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c6ddeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c6ddeb

Branch: refs/heads/TINKERPOP-1975
Commit: e3c6ddeb30956ed661386b00889bb6e3e0b3c99f
Parents: fd11517
Author: Florian Hockmann 
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 10 +-
 gremlin-server/pom.xml  | 10 +-
 pom.xml |  6 ++
 3 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -377,9 +377,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -285,9 +285,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
 false
 
 
+
+parse-version
+
+parse-version
+
+

[08/31] tinkerpop git commit: Add description about Docker credentials TINKERPOP-1897

2018-06-04 Thread spmallette 
Add description about Docker credentials TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d2faa27
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d2faa27
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d2faa27

Branch: refs/heads/TINKERPOP-1975
Commit: 5d2faa2759417ce3a5b1749d573707308523d191
Parents: 47f3c1c
Author: Florian Hockmann 
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/development-environment.asciidoc | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d2faa27/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 cb19a65..c50b189 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,6 +197,11 @@ authentication information on the ~/.npmrc file. The 
easiest way to do that is t
 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.
 
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
+
 [[building-testing]]
 == Building and Testing

[05/31] tinkerpop git commit: Add note to check Docker images before a release TINKERPOP-1897

2018-06-04 Thread spmallette 
Add note to check Docker images before a release TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8232158e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8232158e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8232158e

Branch: refs/heads/TINKERPOP-1975
Commit: 8232158eb51009ec0b434a4b46638c9149b14852
Parents: 0efeb4a
Author: Florian Hockmann 
Authored: Wed May 30 17:22:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/release.asciidoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8232158e/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 7963004..eef4e3f 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,8 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV 
pre-releases.
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
 .. Review JIRA tickets in the release and ensure that:

[06/31] tinkerpop git commit: TINKERPOP-1897 Small rewording

2018-06-04 Thread spmallette 
TINKERPOP-1897 Small rewording


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c125fc98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c125fc98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c125fc98

Branch: refs/heads/TINKERPOP-1975
Commit: c125fc9892fb786466cc0754b51761eb1c982c7a
Parents: 9c3d0f0
Author: Florian Hockmann 
Authored: Thu Mar 15 00:00:07 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/reference/gremlin-applications.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c125fc98/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index e0896ef..273e5c7 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1951,7 +1951,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 [INFO] GremlinServer$1 - Channel started at port 8182.
 
 
-By default, Gremlin Server listens on port 8182. So that port should be 
exposed if it should be reachable on the host:
+By default, Gremlin Server listens on port 8182. So that port needs to be 
exposed if it should be reachable on the host:
 
 [source,bash]

[02/31] tinkerpop git commit: Increase test timeout for slow systems TINKERPOP-1897

2018-06-04 Thread spmallette 
Increase test timeout for slow systems TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b8291539
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8291539
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8291539

Branch: refs/heads/TINKERPOP-1975
Commit: b8291539c7b638f499fe184fd733f1973d408f7e
Parents: a5f1f74
Author: Florian Hockmann 
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:28 2018 +0200

--
 .../java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8291539/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index a7e6066..43442be 100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -281,7 +281,7 @@ public class ResultQueueTest extends 
AbstractResultQueueTest {
 latch.countDown();
 });
 
-assertThat(latch.await(3000, TimeUnit.MILLISECONDS), is(true));
+assertThat(latch.await(1, TimeUnit.MILLISECONDS), is(true));
 
 assertEquals(500, count1.get());
 assertEquals(150, count2.get());

[22/31] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/edc0a46d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/edc0a46d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/edc0a46d

Branch: refs/heads/TINKERPOP-1975
Commit: edc0a46d98904d190a6e17dde927ba80ec4773b8
Parents: 00f77fa 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:30:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:41 2018 -0400

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[10/31] tinkerpop git commit: Remove .docker file activation option for Maven TINKERPOP-1897

2018-06-04 Thread spmallette 
Remove .docker file activation option for Maven TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2

Branch: refs/heads/TINKERPOP-1975
Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84
Parents: 80931ce
Author: Florian Hockmann 
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .gitignore  |  1 -
 docker/hadoop/Dockerfile| 25 
 docker/scripts/build.sh |  3 ---
 .../developer/development-environment.asciidoc  |  4 +---
 gremlin-console/pom.xml |  6 -
 gremlin-server/pom.xml  |  6 -
 pom.xml |  1 -
 7 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 10e5b4f..0109f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
-.docker
 settings.xml
 tools/
 [Dd]ebug/

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile
--
diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile
new file mode 100644
index 000..86b2598
--- /dev/null
+++ b/docker/hadoop/Dockerfile
@@ -0,0 +1,25 @@
+# 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.
+
+FROM tinkerpop:base
+
+MAINTAINER Daniel Kuppitz 
+
+ENV HADOOP_VERSION 2.7.2
+
+COPY install.sh /usr/local/sbin/install-hadoop.sh
+RUN /usr/local/sbin/install-hadoop.sh

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 3d8f0d3..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,9 +67,6 @@ touch gremlin-python/.glv
 touch gremlin-dotnet/src/.glv
 touch gremlin-dotnet/test/.glv
 
-rm gremlin-console/.docker
-rm gremlin-server/.docker
-
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then
   echo "Copying settings.xml"

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/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 cb20d4e..ae97d1a 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -136,9 +136,7 @@ The Docker images can be built from the command line with:
 
 mvn clean install -Pdocker-images
 
-which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
-directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
-in the environment.
+which enables the "docker-images" Maven profile.
 
 
 [[release-environment]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 8e8b357..b5dca0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,12 +338,6 @@ limitations under the License.
 
 
 docker-images
-
-false
-
-.docker
-
-

[8/8] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread florianhockmann 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d7843fea
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7843fea
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d7843fea

Branch: refs/heads/master
Commit: d7843fea02a46423e06f8a2ff3e6a0f72cfb7c57
Parents: 7702b4b d4faa66
Author: Florian Hockmann 
Authored: Mon Jun 4 20:56:26 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:56:26 2018 +0200

--
 gremlin-console/pom.xml | 25 +++--
 gremlin-server/pom.xml  | 25 +++--
 pom.xml | 16 
 3 files changed, 62 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7843fea/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7843fea/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7843fea/pom.xml
--

[7/8] tinkerpop git commit: TINKERPOP-1897 Add latest tag for docker images CTR

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Add latest tag for docker images CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d4faa660
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d4faa660
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d4faa660

Branch: refs/heads/master
Commit: d4faa6605495e072d65578682d2ed5fd12bdb5ad
Parents: 055f1d5
Author: Florian Hockmann 
Authored: Mon Jun 4 20:56:04 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:56:04 2018 +0200

--
 gremlin-console/pom.xml | 21 +
 gremlin-server/pom.xml  | 21 +
 2 files changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4faa660/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b933bf8..d9fc35f 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -383,6 +383,16 @@ limitations under the License.
 
 
 
+docker-image-tag-latest
+
+tag
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
+
 docker-image-push
 deploy
 
@@ -404,6 +414,17 @@ limitations under the License.
 
${only.when.is.prerelease.version}
 
 
+
+docker-image-push-latest
+deploy
+
+push
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
 
 
 tinkerpop/gremlin-console

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4faa660/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 7b20c69..01d5f3e 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -293,6 +293,16 @@ limitations under the License.
 
 
 
+docker-image-tag-latest
+
+tag
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
+
 docker-image-push
 deploy
 
@@ -314,6 +324,17 @@ limitations under the License.
 
${only.when.is.prerelease.version}
 
 
+
+docker-image-push-latest
+deploy
+
+push
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
 
 
 tinkerpop/gremlin-server

[4/8] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread florianhockmann 
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/055f1d5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/055f1d5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/055f1d5e

Branch: refs/heads/tp33
Commit: 055f1d5ee33c6f0f49267ef48365eff9f0d0bafa
Parents: ee65d5f aac534e
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:28 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:28 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/pom.xml
--

[3/8] tinkerpop git commit: TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

Tags like 3.2 should only point to stable releases.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aac534e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aac534e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aac534e1

Branch: refs/heads/tp33
Commit: aac534e11fa406bedc61dbc060d06740b898e170
Parents: 144c698
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:00 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:00 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 29df2a4..8a4a12c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -379,7 +379,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -401,7 +401,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index a75b6c5..517f029 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -287,7 +287,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -309,7 +309,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f2484f8..a9be62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,22 @@ limitations under the License.
 
 
 
+
+build-helper-regex-is-prerelease-version
+validate
+
+regex-property
+
+
+only.when.is.prerelease.version
+${project.version}
+.*-.*
+true
+false
+
+
+
 parse-version
 
 parse-version

[2/8] tinkerpop git commit: TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

Tags like 3.2 should only point to stable releases.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aac534e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aac534e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aac534e1

Branch: refs/heads/tp32
Commit: aac534e11fa406bedc61dbc060d06740b898e170
Parents: 144c698
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:00 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:00 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 29df2a4..8a4a12c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -379,7 +379,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -401,7 +401,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index a75b6c5..517f029 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -287,7 +287,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -309,7 +309,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f2484f8..a9be62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,22 @@ limitations under the License.
 
 
 
+
+build-helper-regex-is-prerelease-version
+validate
+
+regex-property
+
+
+only.when.is.prerelease.version
+${project.version}
+.*-.*
+true
+false
+
+
+
 parse-version
 
 parse-version

[6/8] tinkerpop git commit: TINKERPOP-1897 Add latest tag for docker images CTR

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Add latest tag for docker images CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d4faa660
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d4faa660
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d4faa660

Branch: refs/heads/tp33
Commit: d4faa6605495e072d65578682d2ed5fd12bdb5ad
Parents: 055f1d5
Author: Florian Hockmann 
Authored: Mon Jun 4 20:56:04 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:56:04 2018 +0200

--
 gremlin-console/pom.xml | 21 +
 gremlin-server/pom.xml  | 21 +
 2 files changed, 42 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4faa660/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b933bf8..d9fc35f 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -383,6 +383,16 @@ limitations under the License.
 
 
 
+docker-image-tag-latest
+
+tag
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
+
 docker-image-push
 deploy
 
@@ -404,6 +414,17 @@ limitations under the License.
 
${only.when.is.prerelease.version}
 
 
+
+docker-image-push-latest
+deploy
+
+push
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
 
 
 tinkerpop/gremlin-console

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d4faa660/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 7b20c69..01d5f3e 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -293,6 +293,16 @@ limitations under the License.
 
 
 
+docker-image-tag-latest
+
+tag
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
+
 docker-image-push
 deploy
 
@@ -314,6 +324,17 @@ limitations under the License.
 
${only.when.is.prerelease.version}
 
 
+
+docker-image-push-latest
+deploy
+
+push
+
+
+latest
+
${only.when.is.prerelease.version}
+
+
 
 
 tinkerpop/gremlin-server

[1/8] tinkerpop git commit: TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

2018-06-04 Thread florianhockmann 
Repository: tinkerpop
Updated Branches:
  refs/heads/master 7702b4b83 -> d7843fea0
  refs/heads/tp32 144c69801 -> aac534e11
  refs/heads/tp33 ee65d5f2b -> d4faa6605


TINKERPOP-1897 Prevent tagging of rc docker images with 3.2 CTR

Tags like 3.2 should only point to stable releases.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aac534e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aac534e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aac534e1

Branch: refs/heads/master
Commit: aac534e11fa406bedc61dbc060d06740b898e170
Parents: 144c698
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:00 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:00 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 29df2a4..8a4a12c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -379,7 +379,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -401,7 +401,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index a75b6c5..517f029 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -287,7 +287,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 
@@ -309,7 +309,7 @@ limitations under the License.
 
 
 
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
-${only.when.is.snapshot.used}
+
${only.when.is.prerelease.version}
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aac534e1/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f2484f8..a9be62d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,22 @@ limitations under the License.
 
 
 
+
+build-helper-regex-is-prerelease-version
+validate
+
+regex-property
+
+
+only.when.is.prerelease.version
+${project.version}
+.*-.*
+true
+false
+
+
+
 parse-version
 
 parse-version

[5/8] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread florianhockmann 
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/055f1d5e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/055f1d5e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/055f1d5e

Branch: refs/heads/master
Commit: 055f1d5ee33c6f0f49267ef48365eff9f0d0bafa
Parents: ee65d5f aac534e
Author: Florian Hockmann 
Authored: Mon Jun 4 20:41:28 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 20:41:28 2018 +0200

--
 gremlin-console/pom.xml |  4 ++--
 gremlin-server/pom.xml  |  4 ++--
 pom.xml | 16 
 3 files changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/055f1d5e/pom.xml
--

[1/2] tinkerpop git commit: Need one execution per version to get both docker images to deploy

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 edc0a46d9 -> ee65d5f2b


Need one execution per version to get both docker images to deploy

Given this https://github.com/spotify/dockerfile-maven/issues/10 CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/144c6980
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/144c6980
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/144c6980

Branch: refs/heads/tp33
Commit: 144c69801de8135ac04663da4063260378c71336
Parents: 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:49:34 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:49:34 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 748360c..29df2a4 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -384,10 +384,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0d68e7b..a75b6c5 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -292,10 +292,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/ee65d5f2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ee65d5f2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ee65d5f2

Branch: refs/heads/master
Commit: ee65d5f2ba191b65a383282695074bac38a4d885
Parents: edc0a46 144c698
Author: Stephen Mallette 
Authored: Mon Jun 4 13:57:22 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:57:22 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-server/pom.xml
--

tinkerpop git commit: Need one execution per version to get both docker images to deploy

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 57ac99ec7 -> 144c69801


Need one execution per version to get both docker images to deploy

Given this https://github.com/spotify/dockerfile-maven/issues/10 CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/144c6980
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/144c6980
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/144c6980

Branch: refs/heads/tp32
Commit: 144c69801de8135ac04663da4063260378c71336
Parents: 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:49:34 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:49:34 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 748360c..29df2a4 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -384,10 +384,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0d68e7b..a75b6c5 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -292,10 +292,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}

[3/3] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7702b4b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7702b4b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7702b4b8

Branch: refs/heads/master
Commit: 7702b4b83cc8fba8b806d269f879f3b791be30c6
Parents: 8364047 ee65d5f
Author: Stephen Mallette 
Authored: Mon Jun 4 13:57:32 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:57:32 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7702b4b8/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7702b4b8/gremlin-server/pom.xml
--

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/ee65d5f2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ee65d5f2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ee65d5f2

Branch: refs/heads/tp33
Commit: ee65d5f2ba191b65a383282695074bac38a4d885
Parents: edc0a46 144c698
Author: Stephen Mallette 
Authored: Mon Jun 4 13:57:22 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:57:22 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ee65d5f2/gremlin-server/pom.xml
--

[1/3] tinkerpop git commit: Need one execution per version to get both docker images to deploy

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/master 836404711 -> 7702b4b83


Need one execution per version to get both docker images to deploy

Given this https://github.com/spotify/dockerfile-maven/issues/10 CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/144c6980
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/144c6980
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/144c6980

Branch: refs/heads/master
Commit: 144c69801de8135ac04663da4063260378c71336
Parents: 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:49:34 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:49:34 2018 -0400

--
 gremlin-console/pom.xml | 13 +
 gremlin-server/pom.xml  | 13 +
 2 files changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 748360c..29df2a4 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -384,10 +384,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/144c6980/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 0d68e7b..a75b6c5 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -292,10 +292,23 @@ limitations under the License.
 
 
 docker-image-push
+deploy
 
 push
 
 
+${project.version}
+${only.when.is.snapshot.used}
+
+
+
+docker-image-push-minor-version
+deploy
+
+push
+
+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
 ${only.when.is.snapshot.used}

[tinkerpop] Git Push Summary

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Tags:  refs/tags/3.2.10-rc1 [created] 7009d1c6c

tinkerpop git commit: Minor doc updates around docker CTR

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 1c3f34f52 -> 57ac99ec7


Minor doc updates around docker CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/57ac99ec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/57ac99ec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/57ac99ec

Branch: refs/heads/tp32
Commit: 57ac99ec7d489e480fb73fa72ae544af130b76ae
Parents: 1c3f34f
Author: Stephen Mallette 
Authored: Mon Jun 4 10:56:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:31 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 273e5c7..f044df8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -355,6 +355,7 @@ Like, execution mode, it is also possible to pass multiple 
scripts by specifying
 
 [[gremlin-console-docker-image]]
 === Docker Image
+
 The Gremlin Console can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
 
 [source,text]
@@ -1935,6 +1936,7 @@ immediately forget the script after execution. In this 
way, the function does no
 
 [[gremlin-server-docker-image]]
 === Docker Image
+
 The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
 
 [source,text]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/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 ccdf51a..593c631 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,21 @@ Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.as
 
 === Upgrading for Users
 
+ Docker Images
+
+Docker images are now available on 
link:https://hub.docker.com/u/tinkerpop/[Docker Hub] for Gremlin Console and 
Gremlin
+Server.
+
+[source,text]
+
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+$ docker run tinkerpop/gremlin-server:x.y.z
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1897[TINKERPOP-1897],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-console-docker-image[Reference
 Documentation - Gremlin Console],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-server-docker-image[Reference
 Documentation - Gremlin Server],
+
  TinkerFactory.createGratefulDead()
 
 The Grateful Dead dataset has been with TinkerPop since the early days of 1.x. 
It has always been available as a

[3/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/edc0a46d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/edc0a46d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/edc0a46d

Branch: refs/heads/tp33
Commit: edc0a46d98904d190a6e17dde927ba80ec4773b8
Parents: 00f77fa 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:30:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:41 2018 -0400

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[1/3] tinkerpop git commit: Make docker-entrypoint.sh scripts executable TINKERPOP-1897

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 00f77fad2 -> edc0a46d9


Make docker-entrypoint.sh scripts executable TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c3f34f5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c3f34f5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c3f34f5

Branch: refs/heads/tp33
Commit: 1c3f34f52b2651897aa2fe89527cae8d2357dcc6
Parents: 6f6d941
Author: Florian Hockmann 
Authored: Mon Jun 4 19:12:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 19:12:53 2018 +0200

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-console/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh 
b/gremlin-console/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-server/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh 
b/gremlin-server/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

[2/3] tinkerpop git commit: Minor doc updates around docker CTR

2018-06-04 Thread spmallette 
Minor doc updates around docker CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/57ac99ec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/57ac99ec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/57ac99ec

Branch: refs/heads/tp33
Commit: 57ac99ec7d489e480fb73fa72ae544af130b76ae
Parents: 1c3f34f
Author: Stephen Mallette 
Authored: Mon Jun 4 10:56:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:31 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 273e5c7..f044df8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -355,6 +355,7 @@ Like, execution mode, it is also possible to pass multiple 
scripts by specifying
 
 [[gremlin-console-docker-image]]
 === Docker Image
+
 The Gremlin Console can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
 
 [source,text]
@@ -1935,6 +1936,7 @@ immediately forget the script after execution. In this 
way, the function does no
 
 [[gremlin-server-docker-image]]
 === Docker Image
+
 The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
 
 [source,text]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/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 ccdf51a..593c631 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,21 @@ Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.as
 
 === Upgrading for Users
 
+ Docker Images
+
+Docker images are now available on 
link:https://hub.docker.com/u/tinkerpop/[Docker Hub] for Gremlin Console and 
Gremlin
+Server.
+
+[source,text]
+
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+$ docker run tinkerpop/gremlin-server:x.y.z
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1897[TINKERPOP-1897],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-console-docker-image[Reference
 Documentation - Gremlin Console],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-server-docker-image[Reference
 Documentation - Gremlin Server],
+
  TinkerFactory.createGratefulDead()
 
 The Grateful Dead dataset has been with TinkerPop since the early days of 1.x. 
It has always been available as a

[1/4] tinkerpop git commit: Make docker-entrypoint.sh scripts executable TINKERPOP-1897

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/master 9eac7f705 -> 836404711


Make docker-entrypoint.sh scripts executable TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c3f34f5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c3f34f5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c3f34f5

Branch: refs/heads/master
Commit: 1c3f34f52b2651897aa2fe89527cae8d2357dcc6
Parents: 6f6d941
Author: Florian Hockmann 
Authored: Mon Jun 4 19:12:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 19:12:53 2018 +0200

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-console/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh 
b/gremlin-console/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-server/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh 
b/gremlin-server/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

[4/4] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/83640471
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/83640471
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/83640471

Branch: refs/heads/master
Commit: 8364047117bd6080cfe8184faafacf4ee7166113
Parents: 9eac7f7 edc0a46
Author: Stephen Mallette 
Authored: Mon Jun 4 13:30:57 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:57 2018 -0400

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[2/4] tinkerpop git commit: Minor doc updates around docker CTR

2018-06-04 Thread spmallette 
Minor doc updates around docker CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/57ac99ec
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/57ac99ec
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/57ac99ec

Branch: refs/heads/master
Commit: 57ac99ec7d489e480fb73fa72ae544af130b76ae
Parents: 1c3f34f
Author: Stephen Mallette 
Authored: Mon Jun 4 10:56:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:31 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 273e5c7..f044df8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -355,6 +355,7 @@ Like, execution mode, it is also possible to pass multiple 
scripts by specifying
 
 [[gremlin-console-docker-image]]
 === Docker Image
+
 The Gremlin Console can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
 
 [source,text]
@@ -1935,6 +1936,7 @@ immediately forget the script after execution. In this 
way, the function does no
 
 [[gremlin-server-docker-image]]
 === Docker Image
+
 The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
 
 [source,text]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/57ac99ec/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 ccdf51a..593c631 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,21 @@ Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.as
 
 === Upgrading for Users
 
+ Docker Images
+
+Docker images are now available on 
link:https://hub.docker.com/u/tinkerpop/[Docker Hub] for Gremlin Console and 
Gremlin
+Server.
+
+[source,text]
+
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+$ docker run tinkerpop/gremlin-server:x.y.z
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1897[TINKERPOP-1897],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-console-docker-image[Reference
 Documentation - Gremlin Console],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-server-docker-image[Reference
 Documentation - Gremlin Server],
+
  TinkerFactory.createGratefulDead()
 
 The Grateful Dead dataset has been with TinkerPop since the early days of 1.x. 
It has always been available as a

[3/4] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/edc0a46d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/edc0a46d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/edc0a46d

Branch: refs/heads/master
Commit: edc0a46d98904d190a6e17dde927ba80ec4773b8
Parents: 00f77fa 57ac99e
Author: Stephen Mallette 
Authored: Mon Jun 4 13:30:41 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:30:41 2018 -0400

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--

[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/00f77fad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00f77fad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00f77fad

Branch: refs/heads/tp33
Commit: 00f77fad23f22c79014a2da8343e5f59e6a6f167
Parents: 31a3b44 c2ff47c
Author: Stephen Mallette 
Authored: Mon Jun 4 13:28:49 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:28:49 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00f77fad/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00f77fad/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

[1/2] tinkerpop git commit: Minor doc updates around docker CTR

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 31a3b444e -> 00f77fad2


Minor doc updates around docker CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c2ff47ca
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2ff47ca
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c2ff47ca

Branch: refs/heads/tp33
Commit: c2ff47ca5ff5dc4a6bef82f9ac1da3b24ff24d7f
Parents: 6f6d941
Author: Stephen Mallette 
Authored: Mon Jun 4 10:56:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 10:56:20 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2ff47ca/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 273e5c7..f044df8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -355,6 +355,7 @@ Like, execution mode, it is also possible to pass multiple 
scripts by specifying
 
 [[gremlin-console-docker-image]]
 === Docker Image
+
 The Gremlin Console can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
 
 [source,text]
@@ -1935,6 +1936,7 @@ immediately forget the script after execution. In this 
way, the function does no
 
 [[gremlin-server-docker-image]]
 === Docker Image
+
 The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
 
 [source,text]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2ff47ca/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 ccdf51a..593c631 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,21 @@ Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.as
 
 === Upgrading for Users
 
+ Docker Images
+
+Docker images are now available on 
link:https://hub.docker.com/u/tinkerpop/[Docker Hub] for Gremlin Console and 
Gremlin
+Server.
+
+[source,text]
+
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+$ docker run tinkerpop/gremlin-server:x.y.z
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1897[TINKERPOP-1897],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-console-docker-image[Reference
 Documentation - Gremlin Console],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-server-docker-image[Reference
 Documentation - Gremlin Server],
+
  TinkerFactory.createGratefulDead()
 
 The Grateful Dead dataset has been with TinkerPop since the early days of 1.x. 
It has always been available as a

[3/3] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread spmallette 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9eac7f70
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9eac7f70
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9eac7f70

Branch: refs/heads/master
Commit: 9eac7f705eddd926f962151993a7a2d73a5748e4
Parents: b0a68b8 00f77fa
Author: Stephen Mallette 
Authored: Mon Jun 4 13:28:58 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:28:58 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9eac7f70/docs/src/reference/gremlin-applications.asciidoc
--

[1/3] tinkerpop git commit: Minor doc updates around docker CTR

2018-06-04 Thread spmallette 
Repository: tinkerpop
Updated Branches:
  refs/heads/master b0a68b8c0 -> 9eac7f705


Minor doc updates around docker CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c2ff47ca
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c2ff47ca
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c2ff47ca

Branch: refs/heads/master
Commit: c2ff47ca5ff5dc4a6bef82f9ac1da3b24ff24d7f
Parents: 6f6d941
Author: Stephen Mallette 
Authored: Mon Jun 4 10:56:20 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 10:56:20 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2ff47ca/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 273e5c7..f044df8 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -355,6 +355,7 @@ Like, execution mode, it is also possible to pass multiple 
scripts by specifying
 
 [[gremlin-console-docker-image]]
 === Docker Image
+
 The Gremlin Console can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Docker image]:
 
 [source,text]
@@ -1935,6 +1936,7 @@ immediately forget the script after execution. In this 
way, the function does no
 
 [[gremlin-server-docker-image]]
 === Docker Image
+
 The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
 
 [source,text]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c2ff47ca/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 ccdf51a..593c631 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -29,6 +29,21 @@ Please see the 
link:https://github.com/apache/tinkerpop/blob/3.2.10/CHANGELOG.as
 
 === Upgrading for Users
 
+ Docker Images
+
+Docker images are now available on 
link:https://hub.docker.com/u/tinkerpop/[Docker Hub] for Gremlin Console and 
Gremlin
+Server.
+
+[source,text]
+
+$ docker run -it tinkerpop/gremlin-console:x.y.z
+$ docker run tinkerpop/gremlin-server:x.y.z
+
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1897[TINKERPOP-1897],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-console-docker-image[Reference
 Documentation - Gremlin Console],
+link:http://tinkerpop.apache.org/docs/current/reference#gremlin-server-docker-image[Reference
 Documentation - Gremlin Server],
+
  TinkerFactory.createGratefulDead()
 
 The Grateful Dead dataset has been with TinkerPop since the early days of 1.x. 
It has always been available as a

[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread spmallette 
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/00f77fad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/00f77fad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/00f77fad

Branch: refs/heads/master
Commit: 00f77fad23f22c79014a2da8343e5f59e6a6f167
Parents: 31a3b44 c2ff47c
Author: Stephen Mallette 
Authored: Mon Jun 4 13:28:49 2018 -0400
Committer: Stephen Mallette 
Committed: Mon Jun 4 13:28:49 2018 -0400

--
 docs/src/reference/gremlin-applications.asciidoc   |  2 ++
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 15 +++
 2 files changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00f77fad/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/00f77fad/docs/src/upgrade/release-3.2.x-incubating.asciidoc
--

tinkerpop git commit: Make docker-entrypoint.sh scripts executable TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 6f6d9417a -> 1c3f34f52


Make docker-entrypoint.sh scripts executable TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1c3f34f5
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1c3f34f5
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1c3f34f5

Branch: refs/heads/tp32
Commit: 1c3f34f52b2651897aa2fe89527cae8d2357dcc6
Parents: 6f6d941
Author: Florian Hockmann 
Authored: Mon Jun 4 19:12:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 19:12:53 2018 +0200

--
 gremlin-console/src/main/docker/docker-entrypoint.sh | 0
 gremlin-server/src/main/docker/docker-entrypoint.sh  | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-console/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-console/src/main/docker/docker-entrypoint.sh 
b/gremlin-console/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1c3f34f5/gremlin-server/src/main/docker/docker-entrypoint.sh
--
diff --git a/gremlin-server/src/main/docker/docker-entrypoint.sh 
b/gremlin-server/src/main/docker/docker-entrypoint.sh
old mode 100644
new mode 100755

[18/42] tinkerpop git commit: Remove verbose log output TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Remove verbose log output TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47f3c1cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47f3c1cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47f3c1cc

Branch: refs/heads/master
Commit: 47f3c1ccd697546ab2e5fd8d3c48904f53da1551
Parents: b829153
Author: Florian Hockmann 
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .../src/reference/gremlin-applications.asciidoc | 26 +---
 1 file changed, 1 insertion(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47f3c1cc/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 80659af..e0896ef 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1946,31 +1946,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 -oOOo-(3)-oOOo-
 
 [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with 
report interval=18ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report 
interval=18ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= 
and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with 
interval=18ms and 
loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via 
[conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool.  Threads in 
pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with 
scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing 
GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine 
and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with 
graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with 
size 1000 and expiration time of 60 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured 
application/vnd.gremlin-v1.0+gryo-stringd with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
 [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
 [INFO] GremlinServer$1 - Channel started at port 8182.

[13/42] tinkerpop git commit: Add description about Docker credentials TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add description about Docker credentials TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d2faa27
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d2faa27
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d2faa27

Branch: refs/heads/tp33
Commit: 5d2faa2759417ce3a5b1749d573707308523d191
Parents: 47f3c1c
Author: Florian Hockmann 
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/development-environment.asciidoc | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d2faa27/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 cb19a65..c50b189 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,6 +197,11 @@ authentication information on the ~/.npmrc file. The 
easiest way to do that is t
 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.
 
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
+
 [[building-testing]]
 == Building and Testing

[27/42] tinkerpop git commit: Remove .docker file activation option for Maven TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Remove .docker file activation option for Maven TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2

Branch: refs/heads/tp32
Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84
Parents: 80931ce
Author: Florian Hockmann 
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .gitignore  |  1 -
 docker/hadoop/Dockerfile| 25 
 docker/scripts/build.sh |  3 ---
 .../developer/development-environment.asciidoc  |  4 +---
 gremlin-console/pom.xml |  6 -
 gremlin-server/pom.xml  |  6 -
 pom.xml |  1 -
 7 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 10e5b4f..0109f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
-.docker
 settings.xml
 tools/
 [Dd]ebug/

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile
--
diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile
new file mode 100644
index 000..86b2598
--- /dev/null
+++ b/docker/hadoop/Dockerfile
@@ -0,0 +1,25 @@
+# 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.
+
+FROM tinkerpop:base
+
+MAINTAINER Daniel Kuppitz 
+
+ENV HADOOP_VERSION 2.7.2
+
+COPY install.sh /usr/local/sbin/install-hadoop.sh
+RUN /usr/local/sbin/install-hadoop.sh

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 3d8f0d3..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,9 +67,6 @@ touch gremlin-python/.glv
 touch gremlin-dotnet/src/.glv
 touch gremlin-dotnet/test/.glv
 
-rm gremlin-console/.docker
-rm gremlin-server/.docker
-
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then
   echo "Copying settings.xml"

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/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 cb20d4e..ae97d1a 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -136,9 +136,7 @@ The Docker images can be built from the command line with:
 
 mvn clean install -Pdocker-images
 
-which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
-directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
-in the environment.
+which enables the "docker-images" Maven profile.
 
 
 [[release-environment]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 8e8b357..b5dca0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,12 +338,6 @@ limitations under the License.
 
 
 docker-images
-
-false
-
-.docker
-
-

[17/42] tinkerpop git commit: Add clarification for Docker image releases TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add clarification for Docker image releases TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80931cee
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80931cee
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80931cee

Branch: refs/heads/master
Commit: 80931cee80613c1f910f26c6ceeb25bcf796cd83
Parents: e3c6dde
Author: Florian Hockmann 
Authored: Wed May 23 18:30:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/development-environment.asciidoc | 8 +---
 docs/src/dev/developer/release.asciidoc | 5 +
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/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 c50b189..cb20d4e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,9 +197,11 @@ authentication information on the ~/.npmrc file. The 
easiest way to do that is t
 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.
 
-Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
-`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
-credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
an account that is a member of the TinkerPop
+organization. So if you don't already have an account on Docker Hub then 
create one and request that
+a PMC member adds your account to the TinkerPop organization. Afterwards, 
authentication information needs to be added to
+the `~/.docker/config.json` file. This information can simply be added with 
the `docker login` command which will ask for
+credentials. This must be done only once. Finally, `docker push` can be used 
to push images to Docker Hub which will
 be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
 
 [[building-testing]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 473e842..7963004 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -233,6 +233,11 @@ for generating javadoc and without that the binary 
distributions won't contain t
 .. `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]
+. Deploy the Docker images
+.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+. Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
+and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `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`.

[21/42] tinkerpop git commit: Remove verbose log output TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Remove verbose log output TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47f3c1cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47f3c1cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47f3c1cc

Branch: refs/heads/tp32
Commit: 47f3c1ccd697546ab2e5fd8d3c48904f53da1551
Parents: b829153
Author: Florian Hockmann 
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .../src/reference/gremlin-applications.asciidoc | 26 +---
 1 file changed, 1 insertion(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47f3c1cc/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 80659af..e0896ef 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1946,31 +1946,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 -oOOo-(3)-oOOo-
 
 [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with 
report interval=18ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report 
interval=18ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= 
and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with 
interval=18ms and 
loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via 
[conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool.  Threads in 
pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with 
scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing 
GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine 
and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with 
graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with 
size 1000 and expiration time of 60 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured 
application/vnd.gremlin-v1.0+gryo-stringd with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
 [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
 [INFO] GremlinServer$1 - Channel started at port 8182.

[12/42] tinkerpop git commit: Replace hardcoded version tags by parsed version TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Replace hardcoded version tags by parsed version TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c6ddeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c6ddeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c6ddeb

Branch: refs/heads/tp32
Commit: e3c6ddeb30956ed661386b00889bb6e3e0b3c99f
Parents: fd11517
Author: Florian Hockmann 
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 10 +-
 gremlin-server/pom.xml  | 10 +-
 pom.xml |  6 ++
 3 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -377,9 +377,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -285,9 +285,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
 false
 
 
+
+parse-version
+
+parse-version
+
+

[29/42] tinkerpop git commit: Remove .docker file activation option for Maven TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Remove .docker file activation option for Maven TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2

Branch: refs/heads/tp33
Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84
Parents: 80931ce
Author: Florian Hockmann 
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .gitignore  |  1 -
 docker/hadoop/Dockerfile| 25 
 docker/scripts/build.sh |  3 ---
 .../developer/development-environment.asciidoc  |  4 +---
 gremlin-console/pom.xml |  6 -
 gremlin-server/pom.xml  |  6 -
 pom.xml |  1 -
 7 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 10e5b4f..0109f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
-.docker
 settings.xml
 tools/
 [Dd]ebug/

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile
--
diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile
new file mode 100644
index 000..86b2598
--- /dev/null
+++ b/docker/hadoop/Dockerfile
@@ -0,0 +1,25 @@
+# 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.
+
+FROM tinkerpop:base
+
+MAINTAINER Daniel Kuppitz 
+
+ENV HADOOP_VERSION 2.7.2
+
+COPY install.sh /usr/local/sbin/install-hadoop.sh
+RUN /usr/local/sbin/install-hadoop.sh

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 3d8f0d3..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,9 +67,6 @@ touch gremlin-python/.glv
 touch gremlin-dotnet/src/.glv
 touch gremlin-dotnet/test/.glv
 
-rm gremlin-console/.docker
-rm gremlin-server/.docker
-
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then
   echo "Copying settings.xml"

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/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 cb20d4e..ae97d1a 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -136,9 +136,7 @@ The Docker images can be built from the command line with:
 
 mvn clean install -Pdocker-images
 
-which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
-directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
-in the environment.
+which enables the "docker-images" Maven profile.
 
 
 [[release-environment]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 8e8b357..b5dca0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,12 +338,6 @@ limitations under the License.
 
 
 docker-images
-
-false
-
-.docker
-
-

[40/42] tinkerpop git commit: Merge branch 'tp32' into tp33

2018-06-04 Thread florianhockmann 
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/31a3b444
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31a3b444
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31a3b444

Branch: refs/heads/tp33
Commit: 31a3b444ec290b3868337edb664348efbbd567ee
Parents: f2e74ff 6f6d941
Author: Florian Hockmann 
Authored: Mon Jun 4 16:05:04 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 16:05:04 2018 +0200

--
 .dockerignore   |  2 +
 CHANGELOG.asciidoc  |  2 +-
 docker/hadoop/Dockerfile| 25 
 .../developer/development-environment.asciidoc  | 22 ++-
 docs/src/dev/developer/release.asciidoc |  8 ++-
 .../src/reference/gremlin-applications.asciidoc | 65 
 gremlin-console/Dockerfile  | 31 ++
 gremlin-console/pom.xml | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 24 
 .../gremlin/driver/ResultQueueTest.java |  2 +-
 gremlin-server/Dockerfile   | 35 +++
 gremlin-server/pom.xml  | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 31 ++
 pom.xml | 35 +++
 14 files changed, 406 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/development-environment.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/dev/developer/release.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/docs/src/reference/gremlin-applications.asciidoc
--
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 26ec185,273e5c7..bf0875a
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -2080,9 -1930,42 +2112,42 @@@ $ curl -X POST -d "{\"gremlin\":\"divid
  {"message":"Error encountered evaluating script: divideIt(8, 2)"}
  
  
 -In the above REST-based requests, the bindings contain a special parameter 
that tells the `ScriptEngine` cache to
 +In the above HTTP-based requests, the bindings contain a special parameter 
that tells the `ScriptEngine` cache to
  immediately forget the script after execution. In this way, the function does 
not end up being globally available.
  
+ [[gremlin-server-docker-image]]
+ === Docker Image
+ The Gremlin Server can also be started as a 
link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Docker image]:
+ 
+ [source,text]
+ 
+ $ docker run tinkerpop/gremlin-server:x.y.z
+ [INFO] GremlinServer - 
+  \,,,/
+  (o o)
+ -oOOo-(3)-oOOo-
+ 
+ [INFO] GremlinServer - Configuring Gremlin Server from 
conf/gremlin-server.yaml
+ ...
+ [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
+ [INFO] GremlinServer$1 - Channel started at port 8182.
+ 
+ 
+ By default, Gremlin Server listens on port 8182. So that port needs to be 
exposed if it should be reachable on the host:
+ 
+ [source,bash]
+ 
+ $ docker run -p 8182:8182 tinkerpop/gremlin-server:x.y.z
+ 
+ 
+ Arguments provided with `docker run` are forwarded to the script that starts 
Gremlin Server. This allows for example
+ to use an alternative config file:
+ 
+ [source,bash]
+ 
+ $ docker run tinkerpop/gremlin-server:x.y.z conf/gremlin-server-secure.yaml
+ 
+ 
  [[gremlin-plugins]]
  == Gremlin Plugins
  

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/31a3b444/pom.xml
--

[23/42] tinkerpop git commit: TINKERPOP-1897 Small rewording

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Small rewording


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c125fc98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c125fc98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c125fc98

Branch: refs/heads/tp32
Commit: c125fc9892fb786466cc0754b51761eb1c982c7a
Parents: 9c3d0f0
Author: Florian Hockmann 
Authored: Thu Mar 15 00:00:07 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/reference/gremlin-applications.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c125fc98/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index e0896ef..273e5c7 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1951,7 +1951,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 [INFO] GremlinServer$1 - Channel started at port 8182.
 
 
-By default, Gremlin Server listens on port 8182. So that port should be 
exposed if it should be reachable on the host:
+By default, Gremlin Server listens on port 8182. So that port needs to be 
exposed if it should be reachable on the host:
 
 [source,bash]

[26/42] tinkerpop git commit: Add clarification for Docker image releases TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add clarification for Docker image releases TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80931cee
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80931cee
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80931cee

Branch: refs/heads/tp32
Commit: 80931cee80613c1f910f26c6ceeb25bcf796cd83
Parents: e3c6dde
Author: Florian Hockmann 
Authored: Wed May 23 18:30:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/development-environment.asciidoc | 8 +---
 docs/src/dev/developer/release.asciidoc | 5 +
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/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 c50b189..cb20d4e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,9 +197,11 @@ authentication information on the ~/.npmrc file. The 
easiest way to do that is t
 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.
 
-Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
-`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
-credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
an account that is a member of the TinkerPop
+organization. So if you don't already have an account on Docker Hub then 
create one and request that
+a PMC member adds your account to the TinkerPop organization. Afterwards, 
authentication information needs to be added to
+the `~/.docker/config.json` file. This information can simply be added with 
the `docker login` command which will ask for
+credentials. This must be done only once. Finally, `docker push` can be used 
to push images to Docker Hub which will
 be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
 
 [[building-testing]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 473e842..7963004 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -233,6 +233,11 @@ for generating javadoc and without that the binary 
distributions won't contain t
 .. `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]
+. Deploy the Docker images
+.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+. Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
+and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `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`.

[14/42] tinkerpop git commit: Add clarification for Docker image releases TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add clarification for Docker image releases TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/80931cee
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/80931cee
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/80931cee

Branch: refs/heads/tp33
Commit: 80931cee80613c1f910f26c6ceeb25bcf796cd83
Parents: e3c6dde
Author: Florian Hockmann 
Authored: Wed May 23 18:30:53 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/development-environment.asciidoc | 8 +---
 docs/src/dev/developer/release.asciidoc | 5 +
 2 files changed, 10 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/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 c50b189..cb20d4e 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,9 +197,11 @@ authentication information on the ~/.npmrc file. The 
easiest way to do that is t
 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.
 
-Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
-`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
-credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
an account that is a member of the TinkerPop
+organization. So if you don't already have an account on Docker Hub then 
create one and request that
+a PMC member adds your account to the TinkerPop organization. Afterwards, 
authentication information needs to be added to
+the `~/.docker/config.json` file. This information can simply be added with 
the `docker login` command which will ask for
+credentials. This must be done only once. Finally, `docker push` can be used 
to push images to Docker Hub which will
 be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
 
 [[building-testing]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/80931cee/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 473e842..7963004 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -233,6 +233,11 @@ for generating javadoc and without that the binary 
distributions won't contain t
 .. `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]
+. Deploy the Docker images
+.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+. Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
+and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `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`.

[38/42] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm artifact deployment in that profile.

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm 
artifact deployment in that profile.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f6d9417
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f6d9417
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f6d9417

Branch: refs/heads/master
Commit: 6f6d9417a4c938f42b8260b8bd5328d147106a0e
Parents: 8232158
Author: Stephen Mallette 
Authored: Mon Jun 4 09:26:22 2018 -0400
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:30 2018 +0200

--
 .../developer/development-environment.asciidoc|  9 +
 docs/src/dev/developer/release.asciidoc   |  6 +++---
 gremlin-console/pom.xml   | 18 +-
 gremlin-server/pom.xml| 18 +-
 4 files changed, 42 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/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 ae97d1a..6b1dbd6 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -129,15 +129,16 @@ See the <> 
section for more information
 
 [[docker-environment]]
 === Docker Environment
-The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
 
-The Docker images can be built from the command line with:
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console. The Docker images
+can be built from the command line with:
+
 [source,text]
 
-mvn clean install -Pdocker-images
+mvn clean install -pl gremlin-server,gremlin-console -DdockerImages
 
-which enables the "docker-images" Maven profile.
 
+which enables the "docker-images" Maven profile.
 
 [[release-environment]]
 === Release Environment

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index eef4e3f..5496b31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,7 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -DdockerImages`
 .. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
@@ -235,8 +235,8 @@ for generating javadoc and without that the binary 
distributions won't contain t
 . 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]
 . Deploy the Docker images
-.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
-.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-console -DskipTests -DdockerImages`
+.. `mvn deploy -pl gremlin-server -DskipTests -DdockerImages`
 . Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
 and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; 
svn up dev/xx.yy.zz`

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b5dca0e..748360c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,8 +338,24 @@ limitations under the License.
 
 
 docker-images
+
+false
+
+dockerImages
+
+
 
-
+
+
+
+org.apache.maven.plugins
+

[19/42] tinkerpop git commit: Remove verbose log output TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Remove verbose log output TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/47f3c1cc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/47f3c1cc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/47f3c1cc

Branch: refs/heads/tp33
Commit: 47f3c1ccd697546ab2e5fd8d3c48904f53da1551
Parents: b829153
Author: Florian Hockmann 
Authored: Thu Mar 1 17:19:39 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .../src/reference/gremlin-applications.asciidoc | 26 +---
 1 file changed, 1 insertion(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/47f3c1cc/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index 80659af..e0896ef 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1946,31 +1946,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 -oOOo-(3)-oOOo-
 
 [INFO] GremlinServer - Configuring Gremlin Server from conf/gremlin-server.yaml
-[INFO] MetricManager - Configured Metrics ConsoleReporter configured with 
report interval=18ms
-[INFO] MetricManager - Configured Metrics CsvReporter configured with report 
interval=18ms to fileName=/tmp/gremlin-server-metrics.csv
-[INFO] MetricManager - Configured Metrics JmxReporter configured with domain= 
and agentId=
-[INFO] MetricManager - Configured Metrics Slf4jReporter configured with 
interval=18ms and 
loggerName=org.apache.tinkerpop.gremlin.server.Settings$Slf4jReporterMetrics
-[INFO] DefaultGraphManager - Graph [graph] was successfully configured via 
[conf/tinkergraph-empty.properties].
-[INFO] ServerGremlinExecutor - Initialized Gremlin thread pool.  Threads in 
pool named with pattern gremlin-*
-[INFO] ScriptEngines - Loaded gremlin-groovy ScriptEngine
-[INFO] GremlinExecutor - Initialized gremlin-groovy ScriptEngine with 
scripts/empty-sample.groovy
-[INFO] ServerGremlinExecutor - Initialized GremlinExecutor and preparing 
GremlinScriptEngines instances.
-[INFO] ServerGremlinExecutor - Initialized gremlin-groovy GremlinScriptEngine 
and registered metrics
-[INFO] ServerGremlinExecutor - A GraphTraversalSource is now bound to [g] with 
graphtraversalsource[tinkergraph[vertices:0 edges:0], standard]
-[INFO] OpLoader - Adding the standard OpProcessor.
-[INFO] OpLoader - Adding the control OpProcessor.
-[INFO] OpLoader - Adding the session OpProcessor.
-[INFO] OpLoader - Adding the traversal OpProcessor.
-[INFO] TraversalOpProcessor - Initialized cache for TraversalOpProcessor with 
size 1000 and expiration time of 60 ms
-[INFO] GremlinServer - Executing start up LifeCycleHook
-[INFO] Logger$info - Executed once at startup of Gremlin Server.
-[INFO] GremlinServer - idleConnectionTimeout was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] GremlinServer - keepAliveInterval was set to 0 which resolves to 0 
seconds when configuring this value - this feature will be disabled
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+gryo with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured 
application/vnd.gremlin-v1.0+gryo-stringd with 
org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v1.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV1d0
-[INFO] AbstractChannelizer - Configured application/vnd.gremlin-v2.0+json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerGremlinV2d0
-[INFO] AbstractChannelizer - Configured application/json with 
org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV1d0
+...
 [INFO] GremlinServer$1 - Gremlin Server configured with worker thread pool of 
1, gremlin pool of 4 and boss thread pool of 1.
 [INFO] GremlinServer$1 - Channel started at port 8182.

[37/42] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm artifact deployment in that profile.

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm 
artifact deployment in that profile.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f6d9417
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f6d9417
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f6d9417

Branch: refs/heads/tp32
Commit: 6f6d9417a4c938f42b8260b8bd5328d147106a0e
Parents: 8232158
Author: Stephen Mallette 
Authored: Mon Jun 4 09:26:22 2018 -0400
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:30 2018 +0200

--
 .../developer/development-environment.asciidoc|  9 +
 docs/src/dev/developer/release.asciidoc   |  6 +++---
 gremlin-console/pom.xml   | 18 +-
 gremlin-server/pom.xml| 18 +-
 4 files changed, 42 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/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 ae97d1a..6b1dbd6 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -129,15 +129,16 @@ See the <> 
section for more information
 
 [[docker-environment]]
 === Docker Environment
-The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
 
-The Docker images can be built from the command line with:
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console. The Docker images
+can be built from the command line with:
+
 [source,text]
 
-mvn clean install -Pdocker-images
+mvn clean install -pl gremlin-server,gremlin-console -DdockerImages
 
-which enables the "docker-images" Maven profile.
 
+which enables the "docker-images" Maven profile.
 
 [[release-environment]]
 === Release Environment

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index eef4e3f..5496b31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,7 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -DdockerImages`
 .. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
@@ -235,8 +235,8 @@ for generating javadoc and without that the binary 
distributions won't contain t
 . 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]
 . Deploy the Docker images
-.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
-.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-console -DskipTests -DdockerImages`
+.. `mvn deploy -pl gremlin-server -DskipTests -DdockerImages`
 . Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
 and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; 
svn up dev/xx.yy.zz`

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b5dca0e..748360c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,8 +338,24 @@ limitations under the License.
 
 
 docker-images
+
+false
+
+dockerImages
+
+
 
-
+
+
+
+org.apache.maven.plugins
+

[15/42] tinkerpop git commit: Replace hardcoded version tags by parsed version TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Replace hardcoded version tags by parsed version TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c6ddeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c6ddeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c6ddeb

Branch: refs/heads/master
Commit: e3c6ddeb30956ed661386b00889bb6e3e0b3c99f
Parents: fd11517
Author: Florian Hockmann 
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 10 +-
 gremlin-server/pom.xml  | 10 +-
 pom.xml |  6 ++
 3 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -377,9 +377,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -285,9 +285,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
 false
 
 
+
+parse-version
+
+parse-version
+
+

[09/42] tinkerpop git commit: Add docker images for console and server TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add docker images for console and server TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ac78169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ac78169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ac78169

Branch: refs/heads/tp33
Commit: 5ac78169ccd7c6674343204fa22e1af83d2fddcc
Parents: 1a0947b
Author: Florian Hockmann 
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:28 2018 +0200

--
 .dockerignore   |  2 +
 .gitignore  |  1 +
 CHANGELOG.asciidoc  |  2 +-
 .../developer/development-environment.asciidoc  | 16 +++-
 .../src/reference/gremlin-applications.asciidoc | 89 
 gremlin-console/Dockerfile  | 31 +++
 gremlin-console/pom.xml | 34 
 .../src/main/docker/docker-entrypoint.sh| 24 ++
 gremlin-server/Dockerfile   | 35 
 gremlin-server/pom.xml  | 34 
 .../src/main/docker/docker-entrypoint.sh| 31 +++
 pom.xml |  6 ++
 12 files changed, 303 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.dockerignore
--
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
 **/*.log
 **/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
 *.iml
 .idea
 **/*.DS_Store

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
+.docker
 settings.xml
 tools/
 [Dd]ebug/

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6297210..a1d0963 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
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)
 
+* Added Docker images for Gremlin Console and Gremlin Server
 * Fixed bug in `branch()` where reducing steps as options would produce 
incorrect results.
 * Removed recursive handling of streaming results from Gremlin-Python driver 
to avoid max recursion depth errors.
 * Improved performance of `TraversalVertexProgram` and related infrastructure.
@@ -56,7 +57,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * 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/5ac78169/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 4dfbcaa..cb19a65 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -106,7 +106,7 @@ The build optionally requires 
link:https://www.microsoft.com/net/core[.NET Core
 `gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will 
still build with Maven, but .NET projects
 will be skipped.
 
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
 
 [source,text]
 mvn clean install -Pgremlin-dotnet
@@ -127,6 +127,20 @@ other existing Node.js runtime instances in your machine.
 
 See the <> section for more 
information on release manager configurations.
 
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+
+mvn clean install -Pdocker-images
+
+which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
+in the environment.

[36/42] tinkerpop git commit: Add note to check Docker images before a release TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add note to check Docker images before a release TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8232158e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8232158e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8232158e

Branch: refs/heads/tp32
Commit: 8232158eb51009ec0b434a4b46638c9149b14852
Parents: 0efeb4a
Author: Florian Hockmann 
Authored: Wed May 30 17:22:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/release.asciidoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8232158e/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 7963004..eef4e3f 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,8 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV 
pre-releases.
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
 .. Review JIRA tickets in the release and ensure that:

[22/42] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection to root pom.xml

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Move snapshot detection to root pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd115177
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177

Branch: refs/heads/tp33
Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7
Parents: c125fc9
Author: Florian Hockmann 
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 25 +
 gremlin-server/pom.xml  | 25 +
 pom.xml | 29 -
 3 files changed, 26 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+3.0.0
+
+
+
+
+build-helper-regex-is-snapshot-used
+validate
+
+regex-property
+
+
+only.when.is.snapshot.used
+${project.version}
+.*-SNAPSHOT
+true
+false
+
+
+
+
+
 org.apache.maven.plugins
 maven-jar-plugin
 3.0.2
@@ -502,11 +526,6 @@ limitations under

[33/42] tinkerpop git commit: Remove .docker file activation option for Maven TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Remove .docker file activation option for Maven TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0efeb4a2
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0efeb4a2
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0efeb4a2

Branch: refs/heads/master
Commit: 0efeb4a27cb0630cf71165e19681720a8f33ee84
Parents: 80931ce
Author: Florian Hockmann 
Authored: Wed May 23 20:33:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 .gitignore  |  1 -
 docker/hadoop/Dockerfile| 25 
 docker/scripts/build.sh |  3 ---
 .../developer/development-environment.asciidoc  |  4 +---
 gremlin-console/pom.xml |  6 -
 gremlin-server/pom.xml  |  6 -
 pom.xml |  1 -
 7 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 10e5b4f..0109f82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
-.docker
 settings.xml
 tools/
 [Dd]ebug/

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/hadoop/Dockerfile
--
diff --git a/docker/hadoop/Dockerfile b/docker/hadoop/Dockerfile
new file mode 100644
index 000..86b2598
--- /dev/null
+++ b/docker/hadoop/Dockerfile
@@ -0,0 +1,25 @@
+# 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.
+
+FROM tinkerpop:base
+
+MAINTAINER Daniel Kuppitz 
+
+ENV HADOOP_VERSION 2.7.2
+
+COPY install.sh /usr/local/sbin/install-hadoop.sh
+RUN /usr/local/sbin/install-hadoop.sh

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/docker/scripts/build.sh
--
diff --git a/docker/scripts/build.sh b/docker/scripts/build.sh
index 3d8f0d3..5ef74fc 100755
--- a/docker/scripts/build.sh
+++ b/docker/scripts/build.sh
@@ -67,9 +67,6 @@ touch gremlin-python/.glv
 touch gremlin-dotnet/src/.glv
 touch gremlin-dotnet/test/.glv
 
-rm gremlin-console/.docker
-rm gremlin-server/.docker
-
 # use a custom maven settings.xml
 if [ -r "settings.xml" ]; then
   echo "Copying settings.xml"

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/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 cb20d4e..ae97d1a 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -136,9 +136,7 @@ The Docker images can be built from the command line with:
 
 mvn clean install -Pdocker-images
 
-which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
-directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
-in the environment.
+which enables the "docker-images" Maven profile.
 
 
 [[release-environment]]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0efeb4a2/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 8e8b357..b5dca0e 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,12 +338,6 @@ limitations under the License.
 
 
 docker-images
-
-false
-
-.docker
-
-

[28/42] tinkerpop git commit: Replace hardcoded version tags by parsed version TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Replace hardcoded version tags by parsed version TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e3c6ddeb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e3c6ddeb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e3c6ddeb

Branch: refs/heads/tp33
Commit: e3c6ddeb30956ed661386b00889bb6e3e0b3c99f
Parents: fd11517
Author: Florian Hockmann 
Authored: Sat May 19 11:27:57 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 10 +-
 gremlin-server/pom.xml  | 10 +-
 pom.xml |  6 ++
 3 files changed, 16 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index db86d41..8e8b357 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -367,9 +367,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -377,9 +377,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index ef2e609..b2c3435 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -275,9 +275,9 @@ limitations under the License.
 
 tag
 
-
 
-3.2
-${only.when.is.snapshot.used} 

+
+
${parsedVersion.majorVersion}.${parsedVersion.minorVersion}
+${only.when.is.snapshot.used}
 
 
 
@@ -285,9 +285,9 @@ limitations under the License.
 
 push
 
-

+
 ${only.when.is.snapshot.used}
-   
 
+
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e3c6ddeb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 9ff3f3a..398b931 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,6 +285,12 @@ limitations under the License.
 false
 
 
+
+parse-version
+
+parse-version
+
+

[20/42] tinkerpop git commit: Add description about Docker credentials TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add description about Docker credentials TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5d2faa27
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5d2faa27
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5d2faa27

Branch: refs/heads/tp32
Commit: 5d2faa2759417ce3a5b1749d573707308523d191
Parents: 47f3c1c
Author: Florian Hockmann 
Authored: Mon Mar 5 19:52:28 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/development-environment.asciidoc | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5d2faa27/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 cb19a65..c50b189 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -197,6 +197,11 @@ authentication information on the ~/.npmrc file. The 
easiest way to do that is t
 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.
 
+Deploying Docker images to link:https://hub.docker.com/[Docker Hub] requires 
authentication information in the
+`~/.docker/config.json` file. This information can simply be added with the 
`docker login` command which will ask for
+credentials. This must be done only once. Afterwards, `docker push` can be 
used to push images to Docker Hub which will
+be done automatically on `mvn deploy` or it can be triggered manually with 
`mvn dockerfile:push`.
+
 [[building-testing]]
 == Building and Testing

[24/42] tinkerpop git commit: TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions

This also adds the minor version as an additional tag for Docker images
when the version is not a SNAPSHOT version.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9c3d0f00
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9c3d0f00
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9c3d0f00

Branch: refs/heads/tp33
Commit: 9c3d0f00fd77a80ba9f5df4eb49b850110adb4e7
Parents: 5d2faa2
Author: Florian Hockmann 
Authored: Wed Mar 14 22:41:55 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 61 +---
 gremlin-server/pom.xml  | 53 ++
 pom.xml |  5 
 3 files changed, 105 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b7933fb..b24c772 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -347,23 +347,66 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+
+
+build-helper-regex-is-snapshot-used
+validate
+
+regex-property
+
+
+only.when.is.snapshot.used
+${project.version}
+.*-SNAPSHOT
+true
+false
+
+
+
+
+
 com.spotify
 dockerfile-maven-plugin
 
 
-docker-image
-
-build
-push
-
+docker-image-build
+
+build
+
+
+${project.version}
+
+
target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone
+
+
+
+
+docker-image-tag-minor-version
+
+tag
+
+
 
+3.2
+${only.when.is.snapshot.used} 

+
+
+
+docker-image-push
+
+push
+
+

+${only.when.is.snapshot.used}
+   
 
 
 
 
 tinkerpop/gremlin-console
-${project.version}
-
-
target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone
-
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dfc6570..e71f79b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -255,23 +255,66 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+

[31/42] tinkerpop git commit: TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Avoid pushing of Docker images for SNAPSHOT versions

This also adds the minor version as an additional tag for Docker images
when the version is not a SNAPSHOT version.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9c3d0f00
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9c3d0f00
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9c3d0f00

Branch: refs/heads/tp32
Commit: 9c3d0f00fd77a80ba9f5df4eb49b850110adb4e7
Parents: 5d2faa2
Author: Florian Hockmann 
Authored: Wed Mar 14 22:41:55 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 61 +---
 gremlin-server/pom.xml  | 53 ++
 pom.xml |  5 
 3 files changed, 105 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b7933fb..b24c772 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -347,23 +347,66 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+
+
+build-helper-regex-is-snapshot-used
+validate
+
+regex-property
+
+
+only.when.is.snapshot.used
+${project.version}
+.*-SNAPSHOT
+true
+false
+
+
+
+
+
 com.spotify
 dockerfile-maven-plugin
 
 
-docker-image
-
-build
-push
-
+docker-image-build
+
+build
+
+
+${project.version}
+
+
target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone
+
+
+
+
+docker-image-tag-minor-version
+
+tag
+
+
 
+3.2
+${only.when.is.snapshot.used} 

+
+
+
+docker-image-push
+
+push
+
+

+${only.when.is.snapshot.used}
+   
 
 
 
 
 tinkerpop/gremlin-console
-${project.version}
-
-
target/apache-tinkerpop-${project.artifactId}-${project.version}-standalone
-
 
 
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9c3d0f00/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index dfc6570..e71f79b 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -255,23 +255,66 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+

[23/34] tinkerpop git commit: Increase test timeout for slow systems TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Increase test timeout for slow systems TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b8291539
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b8291539
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b8291539

Branch: refs/heads/TINKERPOP-1897
Commit: b8291539c7b638f499fe184fd733f1973d408f7e
Parents: a5f1f74
Author: Florian Hockmann 
Authored: Thu Mar 1 17:17:11 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:28 2018 +0200

--
 .../java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b8291539/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
--
diff --git 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
index a7e6066..43442be 100644
--- 
a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
+++ 
b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/ResultQueueTest.java
@@ -281,7 +281,7 @@ public class ResultQueueTest extends 
AbstractResultQueueTest {
 latch.countDown();
 });
 
-assertThat(latch.await(3000, TimeUnit.MILLISECONDS), is(true));
+assertThat(latch.await(1, TimeUnit.MILLISECONDS), is(true));
 
 assertEquals(500, count1.get());
 assertEquals(150, count2.get());

[27/34] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection to root pom.xml

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Move snapshot detection to root pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd115177
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177

Branch: refs/heads/TINKERPOP-1897
Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7
Parents: c125fc9
Author: Florian Hockmann 
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 25 +
 gremlin-server/pom.xml  | 25 +
 pom.xml | 29 -
 3 files changed, 26 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+3.0.0
+
+
+
+
+build-helper-regex-is-snapshot-used
+validate
+
+regex-property
+
+
+only.when.is.snapshot.used
+${project.version}
+.*-SNAPSHOT
+true
+false
+
+
+
+
+
 org.apache.maven.plugins
 maven-jar-plugin
 3.0.2
@@ -502,11 +526,6 @@

[09/34] tinkerpop git commit: TINKERPOP-1968 Make Pop tests more GLV friendly

2018-06-04 Thread florianhockmann 
TINKERPOP-1968 Make Pop tests more GLV friendly

The java/groovy tests were nicer before, but they don't translate to GLV tests 
well. Had to change them to get them off the ignore list.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fa631e98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fa631e98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fa631e98

Branch: refs/heads/TINKERPOP-1897
Commit: fa631e98381f283ef8d684c0a458fae8afe3529c
Parents: f6d76f9
Author: Stephen Mallette 
Authored: Sat May 19 07:16:09 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 31 16:18:09 2018 -0400

--
 .../traversal/step/map/GroovySelectTest.groovy  |  80 +-
 gremlin-test/features/map/Select.feature| 135 ++
 .../process/traversal/step/map/SelectTest.java  | 245 ---
 .../gremlin/process/FeatureCoverageTest.java|   5 -
 4 files changed, 409 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa631e98/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
--
diff --git 
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
 
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
index 104322d..6f5b73b 100644
--- 
a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
+++ 
b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovySelectTest.groovy
@@ -177,27 +177,83 @@ public abstract class GroovySelectTest {
 // TINKERPOP-619: select should not throw
 
 @Override
-public Traversal get_g_V_selectXaX(final Pop pop) {
-final String root = "g.V."
-new ScriptTraversal<>(g, "gremlin-groovy", root + (null == pop ? 
"select('a')" : "select(${pop}, 'a')"))
+public Traversal get_g_V_selectXaX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V.select('a')")
 }
 
 @Override
-public Traversal> 
get_g_V_selectXa_bX(final Pop pop) {
-final String root = "g.V."
-new ScriptTraversal<>(g, "gremlin-groovy", root + (null == pop ? 
"select('a', 'b')" : "select(${pop}, 'a', 'b')"))
+public Traversal> get_g_V_selectXa_bX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V.select('a', 'b')")
 }
 
 @Override
-public Traversal get_g_V_valueMap_selectXpop_aX(final 
Pop pop) {
-final String root = "g.V.valueMap."
-new ScriptTraversal<>(g, "gremlin-groovy", root + (null == pop ? 
"select('a')" : "select(${pop}, 'a')"))
+public Traversal get_g_V_valueMap_selectXaX() {
+new ScriptTraversal<>(g, "gremlin-groovy", 
"g.V.valueMap().select('a')")
 }
 
 @Override
-public Traversal> 
get_g_V_valueMap_selectXpop_a_bX(final Pop pop) {
-final String root = "g.V.valueMap."
-new ScriptTraversal<>(g, "gremlin-groovy", root + (null == pop ? 
"select('a', 'b')" : "select(${pop}, 'a', 'b')"))
+public Traversal> 
get_g_V_valueMap_selectXa_bX() {
+new ScriptTraversal<>(g, "gremlin-groovy", 
"g.V.valueMap().select('a', 'b')")
+}
+
+@Override
+public Traversal get_g_V_selectXfirst_aX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V.select(Pop.first, 
'a')")
+}
+
+@Override
+public Traversal> 
get_g_V_selectXfirst_a_bX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V.select(Pop.first, 
'a', 'b')")
+}
+
+@Override
+public Traversal get_g_V_valueMap_selectXfirst_aX() {
+new ScriptTraversal<>(g, "gremlin-groovy", 
"g.V.valueMap().select(Pop.first, 'a')")
+}
+
+@Override
+public Traversal> 
get_g_V_valueMap_selectXfirst_a_bX() {
+new ScriptTraversal<>(g, "gremlin-groovy", 
"g.V.valueMap().select(Pop.first, 'a', 'b')")
+}
+
+@Override
+public Traversal get_g_V_selectXlast_aX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V.select(Pop.last, 
'a')")
+}
+
+@Override
+public Traversal> 
get_g_V_selectXlast_a_bX() {
+new ScriptTraversal<>(g, "gremlin-groovy", "g.V.select(Pop.last, 
'a', 'b')")
+}
+
+@Override
+public Traversal get_g_V_valueMap_selectXlast_aX() {
+new ScriptTraversal<>(g, "gremlin-groovy", 
"g.V.valueMap().select(Pop.last, 'a')")
+}
+
+@Override
+

[04/34] tinkerpop git commit: Removed caveat from docs about stargraph limitation

2018-06-04 Thread florianhockmann 
Removed caveat from docs about stargraph limitation

Note that TINKERPOP-693 as "crazy" so no point referencing that anymore CTR


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1b59b9ef
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1b59b9ef
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1b59b9ef

Branch: refs/heads/TINKERPOP-1897
Commit: 1b59b9efdcb5c820622c15d483bae54caf2ff62a
Parents: 6feff18
Author: Stephen Mallette 
Authored: Tue May 29 16:14:21 2018 -0400
Committer: Stephen Mallette 
Committed: Tue May 29 16:14:21 2018 -0400

--
 docs/src/reference/the-traversal.asciidoc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1b59b9ef/docs/src/reference/the-traversal.asciidoc
--
diff --git a/docs/src/reference/the-traversal.asciidoc 
b/docs/src/reference/the-traversal.asciidoc
index e2e3be2..0e7fa26 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2845,8 +2845,7 @@ g.V().as('a').out('knows').as('b').
 WARNING: The anonymous traversal of `where()` processes the current object 
"locally". In OLAP, where the atomic unit
 of computing is the vertex and its local "star graph," it is important that 
the anonymous traversal does not leave
 the confines of the vertex's star graph. In other words, it can not traverse 
to an adjacent vertex's properties or
-edges. Note that is only a temporary limitation that will be addressed in a 
future version of TinkerPop3 (see
-link:https://issues.apache.org/jira/browse/TINKERPOP-693[TINKERPOP-693]).
+edges. 
 
 *Additional References*

[29/34] tinkerpop git commit: Add note to check Docker images before a release TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add note to check Docker images before a release TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8232158e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8232158e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8232158e

Branch: refs/heads/TINKERPOP-1897
Commit: 8232158eb51009ec0b434a4b46638c9149b14852
Parents: 0efeb4a
Author: Florian Hockmann 
Authored: Wed May 30 17:22:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/release.asciidoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8232158e/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 7963004..eef4e3f 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,8 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV 
pre-releases.
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
 .. Review JIRA tickets in the release and ensure that:

[10/42] tinkerpop git commit: Add note to check Docker images before a release TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add note to check Docker images before a release TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8232158e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8232158e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8232158e

Branch: refs/heads/master
Commit: 8232158eb51009ec0b434a4b46638c9149b14852
Parents: 0efeb4a
Author: Florian Hockmann 
Authored: Wed May 30 17:22:19 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/dev/developer/release.asciidoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8232158e/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index 7963004..eef4e3f 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,8 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV 
pre-releases.
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
 .. Review JIRA tickets in the release and ensure that:

[39/42] tinkerpop git commit: TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm artifact deployment in that profile.

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Added -D equivalent of docker mvn profile and disabled jvm 
artifact deployment in that profile.


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6f6d9417
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6f6d9417
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6f6d9417

Branch: refs/heads/tp33
Commit: 6f6d9417a4c938f42b8260b8bd5328d147106a0e
Parents: 8232158
Author: Stephen Mallette 
Authored: Mon Jun 4 09:26:22 2018 -0400
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:30 2018 +0200

--
 .../developer/development-environment.asciidoc|  9 +
 docs/src/dev/developer/release.asciidoc   |  6 +++---
 gremlin-console/pom.xml   | 18 +-
 gremlin-server/pom.xml| 18 +-
 4 files changed, 42 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/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 ae97d1a..6b1dbd6 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -129,15 +129,16 @@ See the <> 
section for more information
 
 [[docker-environment]]
 === Docker Environment
-The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
 
-The Docker images can be built from the command line with:
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console. The Docker images
+can be built from the command line with:
+
 [source,text]
 
-mvn clean install -Pdocker-images
+mvn clean install -pl gremlin-server,gremlin-console -DdockerImages
 
-which enables the "docker-images" Maven profile.
 
+which enables the "docker-images" Maven profile.
 
 [[release-environment]]
 === Release Environment

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/docs/src/dev/developer/release.asciidoc
--
diff --git a/docs/src/dev/developer/release.asciidoc 
b/docs/src/dev/developer/release.asciidoc
index eef4e3f..5496b31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -111,7 +111,7 @@ under release is protected. Tweaks to documentation and 
other odds and ends rela
 during this period.
 . At some point during the week:
 .. Run the full integration test suite: `mvn clean install 
-DskipIntegrationTests=false -DincludeNeo4j`
-.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -Pdocker-images`
+.. Build and test the Docker images: `mvn clean install -pl 
gremlin-server,gremlin-console -DdockerImages`
 .. Deploy a final SNAPSHOT to the snapshot repository as well as GLV and 
Docker image pre-releases.
 .. Review LICENSE and NOTICE files to make sure that no <>.
 .. Review javadoc filters on the "Core API" docs to be sure nothing needs to 
change.
@@ -235,8 +235,8 @@ for generating javadoc and without that the binary 
distributions won't contain t
 . 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]
 . Deploy the Docker images
-.. `mvn deploy -pl gremlin-console -DskipTests -Pdocker-images`
-.. `mvn deploy -pl gremlin-server -DskipTests -Pdocker-images`
+.. `mvn deploy -pl gremlin-console -DskipTests -DdockerImages`
+.. `mvn deploy -pl gremlin-server -DskipTests -DdockerImages`
 . Review the deployed Docker images at 
link:https://hub.docker.com/r/tinkerpop/gremlin-console/[Console]
 and link:https://hub.docker.com/r/tinkerpop/gremlin-server/[Server]
 . `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; 
svn up dev/xx.yy.zz`

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6f6d9417/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b5dca0e..748360c 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -338,8 +338,24 @@ limitations under the License.
 
 
 docker-images
+
+false
+
+dockerImages
+
+
 
-
+
+
+
+org.apache.maven.plugins
+

[42/42] tinkerpop git commit: Merge branch 'tp33'

2018-06-04 Thread florianhockmann 
Merge branch 'tp33'


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b0a68b8c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b0a68b8c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b0a68b8c

Branch: refs/heads/master
Commit: b0a68b8c04b3634d05abcecf6935d0626f7b6969
Parents: 8dba889 31a3b44
Author: Florian Hockmann 
Authored: Mon Jun 4 16:05:13 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 16:05:13 2018 +0200

--
 .dockerignore   |  2 +
 CHANGELOG.asciidoc  |  2 +-
 docker/hadoop/Dockerfile| 25 
 .../developer/development-environment.asciidoc  | 22 ++-
 docs/src/dev/developer/release.asciidoc |  8 ++-
 .../src/reference/gremlin-applications.asciidoc | 65 
 gremlin-console/Dockerfile  | 31 ++
 gremlin-console/pom.xml | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 24 
 .../gremlin/driver/ResultQueueTest.java |  2 +-
 gremlin-server/Dockerfile   | 35 +++
 gremlin-server/pom.xml  | 64 +++
 .../src/main/docker/docker-entrypoint.sh| 31 ++
 pom.xml | 35 +++
 14 files changed, 406 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/CHANGELOG.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/docs/src/reference/gremlin-applications.asciidoc
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/gremlin-console/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/gremlin-server/pom.xml
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b0a68b8c/pom.xml
--

[35/42] tinkerpop git commit: TINKERPOP-1897 Small rewording

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Small rewording


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c125fc98
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c125fc98
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c125fc98

Branch: refs/heads/master
Commit: c125fc9892fb786466cc0754b51761eb1c982c7a
Parents: 9c3d0f0
Author: Florian Hockmann 
Authored: Thu Mar 15 00:00:07 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 docs/src/reference/gremlin-applications.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c125fc98/docs/src/reference/gremlin-applications.asciidoc
--
diff --git a/docs/src/reference/gremlin-applications.asciidoc 
b/docs/src/reference/gremlin-applications.asciidoc
index e0896ef..273e5c7 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1951,7 +1951,7 @@ $ docker run tinkerpop/gremlin-server:x.y.z
 [INFO] GremlinServer$1 - Channel started at port 8182.
 
 
-By default, Gremlin Server listens on port 8182. So that port should be 
exposed if it should be reachable on the host:
+By default, Gremlin Server listens on port 8182. So that port needs to be 
exposed if it should be reachable on the host:
 
 [source,bash]

[34/42] tinkerpop git commit: TINKERPOP-1897 Move snapshot detection to root pom.xml

2018-06-04 Thread florianhockmann 
TINKERPOP-1897 Move snapshot detection to root pom.xml


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/fd115177
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fd115177
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fd115177

Branch: refs/heads/master
Commit: fd115177f2c3ebe72adb308e4505a633dc49bbe7
Parents: c125fc9
Author: Florian Hockmann 
Authored: Sun Apr 15 14:08:51 2018 +0200
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:29 2018 +0200

--
 gremlin-console/pom.xml | 25 +
 gremlin-server/pom.xml  | 25 +
 pom.xml | 29 -
 3 files changed, 26 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-console/pom.xml
--
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index b24c772..db86d41 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -345,30 +345,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/gremlin-server/pom.xml
--
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index e71f79b..ef2e609 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -253,30 +253,7 @@ limitations under the License.
 
 
 
-
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-
-
-build-helper-regex-is-snapshot-used
-validate
-
-regex-property
-
-
-only.when.is.snapshot.used
-${project.version}
-.*-SNAPSHOT
-true
-false
-
-
-
-
+
 
 com.spotify
 dockerfile-maven-plugin

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fd115177/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 19866f0..9ff3f3a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -264,6 +264,30 @@ limitations under the License.
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+3.0.0
+
+
+
+
+build-helper-regex-is-snapshot-used
+validate
+
+regex-property
+
+
+only.when.is.snapshot.used
+${project.version}
+.*-SNAPSHOT
+true
+false
+
+
+
+
+
 org.apache.maven.plugins
 maven-jar-plugin
 3.0.2
@@ -502,11 +526,6 @@ limitations

[04/42] tinkerpop git commit: Add docker images for console and server TINKERPOP-1897

2018-06-04 Thread florianhockmann 
Add docker images for console and server TINKERPOP-1897


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5ac78169
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5ac78169
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5ac78169

Branch: refs/heads/tp32
Commit: 5ac78169ccd7c6674343204fa22e1af83d2fddcc
Parents: 1a0947b
Author: Florian Hockmann 
Authored: Sun Feb 25 18:14:03 2018 +0100
Committer: Florian Hockmann 
Committed: Mon Jun 4 15:57:28 2018 +0200

--
 .dockerignore   |  2 +
 .gitignore  |  1 +
 CHANGELOG.asciidoc  |  2 +-
 .../developer/development-environment.asciidoc  | 16 +++-
 .../src/reference/gremlin-applications.asciidoc | 89 
 gremlin-console/Dockerfile  | 31 +++
 gremlin-console/pom.xml | 34 
 .../src/main/docker/docker-entrypoint.sh| 24 ++
 gremlin-server/Dockerfile   | 35 
 gremlin-server/pom.xml  | 34 
 .../src/main/docker/docker-entrypoint.sh| 31 +++
 pom.xml |  6 ++
 12 files changed, 303 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.dockerignore
--
diff --git a/.dockerignore b/.dockerignore
index afe0e54..50d6801 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,7 @@
 **/*.log
 **/target
+!gremlin-server/target/apache-tinkerpop-gremlin-server-*
+!gremlin-console/target/apache-tinkerpop-gremlin-console-*
 *.iml
 .idea
 **/*.DS_Store

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 0109f82..10e5b4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ __pycache__/
 *.py[cdo]
 __version__.py
 .glv
+.docker
 settings.xml
 tools/
 [Dd]ebug/

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5ac78169/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 6297210..a1d0963 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,6 +23,7 @@ 
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)
 
+* Added Docker images for Gremlin Console and Gremlin Server
 * Fixed bug in `branch()` where reducing steps as options would produce 
incorrect results.
 * Removed recursive handling of streaming results from Gremlin-Python driver 
to avoid max recursion depth errors.
 * Improved performance of `TraversalVertexProgram` and related infrastructure.
@@ -56,7 +57,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * 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/5ac78169/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 4dfbcaa..cb19a65 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -106,7 +106,7 @@ The build optionally requires 
link:https://www.microsoft.com/net/core[.NET Core
 `gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will 
still build with Maven, but .NET projects
 will be skipped.
 
-`gremlin-dotnet` can be build and tested from the command line with:
+`gremlin-dotnet` can be built and tested from the command line with:
 
 [source,text]
 mvn clean install -Pgremlin-dotnet
@@ -127,6 +127,20 @@ other existing Node.js runtime instances in your machine.
 
 See the <> section for more 
information on release manager configurations.
 
+[[docker-environment]]
+=== Docker Environment
+The build optionally requires Docker to build Docker images of Gremlin Server 
and Gremlin Console.
+
+The Docker images can be built from the command line with:
+[source,text]
+
+mvn clean install -Pdocker-images
+
+which enables the "docker-images" Maven profile or in a more automated fashion 
simply add a `.docker` file to the
+directories of the `gremlin-server` and/or `gremlin-console` modules which 
will signify to Maven that Docker is present
+in the environment.

  1   2   >