tinkerpop git commit: TINKERPOP-2031 Removed support for -i in gremlin-server.sh

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-2031 [created] d79c3fff4


TINKERPOP-2031 Removed support for -i in gremlin-server.sh


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

Branch: refs/heads/TINKERPOP-2031
Commit: d79c3fff4cce6d4298ddc1c0d7c5a0c9f0a00dc6
Parents: bdec663
Author: Stephen Mallette 
Authored: Thu Sep 6 08:40:31 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:40:31 2018 -0400

--
 CHANGELOG.asciidoc | 1 +
 gremlin-server/src/main/bin/gremlin-server.bat | 6 --
 gremlin-server/src/main/bin/gremlin-server.sh  | 5 -
 3 files changed, 1 insertion(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d79c3fff/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4e00d80..0072db8 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 This release also includes changes from <>.
 
 * GraphSON `MessageSerializer`s will automatically register the 
GremlinServerModule to a provided GraphSONMapper.
+* Removed support for `-i` option in Gremlin Server which was previously 
deprecated.
 * Implemented `ShortestPathVertexProgram` and the `shortestPath()` step.
 * `AbstractGraphProvider` uses `g.io()` for loading test data.
 * Added the `io()` start step and `read()` and `write()` termination steps to 
the Gremlin language.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d79c3fff/gremlin-server/src/main/bin/gremlin-server.bat
--
diff --git a/gremlin-server/src/main/bin/gremlin-server.bat 
b/gremlin-server/src/main/bin/gremlin-server.bat
index 6c73f48..73df2a3 100644
--- a/gremlin-server/src/main/bin/gremlin-server.bat
+++ b/gremlin-server/src/main/bin/gremlin-server.bat
@@ -36,7 +36,6 @@ cd ..
 set JAVA_OPTIONS=-Xms32m -Xmx512m
 
 if "%1" == "" goto server
-if "%1" == "-i" goto dashi
 if "%1" == "install" goto install
 
 :server
@@ -44,11 +43,6 @@ if "%1" == "install" goto install
 :: Launch the application
 java -Dlog4j.configuration=conf/log4j-server.properties %JAVA_OPTIONS% 
%JAVA_ARGS% -cp "%LIBDIR%/*;%EXTDIR%;" 
org.apache.tinkerpop.gremlin.server.GremlinServer %*
 
-:dashi
-
-echo NOTE: -i is deprecated. Please update your scripts. Using 'install' 
command...
-goto install
-
 :install
 
 set RESTVAR=

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d79c3fff/gremlin-server/src/main/bin/gremlin-server.sh
--
diff --git a/gremlin-server/src/main/bin/gremlin-server.sh 
b/gremlin-server/src/main/bin/gremlin-server.sh
index a09e10c..a15fee6 100755
--- a/gremlin-server/src/main/bin/gremlin-server.sh
+++ b/gremlin-server/src/main/bin/gremlin-server.sh
@@ -252,11 +252,6 @@ case "$1" in
   stop)
 stop
 ;;
-  -i)
-shift
-echo "Redirecting to 'install $@' (-i will be removed in a future release)"
-install "$@"
-;;
   install)
 shift
 install "$@"

[1/2] tinkerpop git commit: Added gremlin version to gremlin server startup logging output CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 81f2292c9 -> a4970a4c3


Added gremlin version to gremlin server startup logging output CTR


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

Branch: refs/heads/tp33
Commit: c029eef8e9641e9908a09b06d4ec7b3f5236508b
Parents: c36fc5c
Author: Stephen Mallette 
Authored: Thu Sep 6 08:23:44 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:23:44 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 gremlin-server/conf/log4j-server.properties   | 1 +
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 48f78e4..158cc7a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 * SSL security enhancements
+* Added Gremlin version to Gremlin Server startup logging output.
 * Fixed problem with Gremlin Server sometimes returning an additional message 
after a failure.
 * Allowed spaces in classpath for `gremlin-server.bat`.
 * Fixed bug in traversals that used Python lambdas with strategies in 
`gremlin-python`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/conf/log4j-server.properties
--
diff --git a/gremlin-server/conf/log4j-server.properties 
b/gremlin-server/conf/log4j-server.properties
index 2529887..8bf809c 100644
--- a/gremlin-server/conf/log4j-server.properties
+++ b/gremlin-server/conf/log4j-server.properties
@@ -29,3 +29,4 @@ 
log4j.logger.org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapR
 log4j.logger.org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph=INFO
 
log4j.logger.org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer=INFO
 log4j.logger.org.apache.spark.metrics.MetricsSystem=ERROR
+log4j.logger.com.jcabi.manifests.Manifests=OFF

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 7aefbe6..a402454 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -38,6 +38,7 @@ import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.util.ThreadFactoryUtil;
+import org.apache.tinkerpop.gremlin.util.Gremlin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -370,7 +371,7 @@ public class GremlinServer {
 
 public static String getHeader() {
 final StringBuilder builder = new StringBuilder();
-builder.append("\r\n");
+builder.append(Gremlin.version() + "\r\n");
 builder.append(" \\,,,/\r\n");
 builder.append(" (o o)\r\n");
 builder.append("-oOOo-(3)-oOOo-\r\n");

tinkerpop git commit: Added gremlin version to gremlin server startup logging output CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 c36fc5c6b -> c029eef8e


Added gremlin version to gremlin server startup logging output CTR


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

Branch: refs/heads/tp32
Commit: c029eef8e9641e9908a09b06d4ec7b3f5236508b
Parents: c36fc5c
Author: Stephen Mallette 
Authored: Thu Sep 6 08:23:44 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:23:44 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 gremlin-server/conf/log4j-server.properties   | 1 +
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 48f78e4..158cc7a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 * SSL security enhancements
+* Added Gremlin version to Gremlin Server startup logging output.
 * Fixed problem with Gremlin Server sometimes returning an additional message 
after a failure.
 * Allowed spaces in classpath for `gremlin-server.bat`.
 * Fixed bug in traversals that used Python lambdas with strategies in 
`gremlin-python`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/conf/log4j-server.properties
--
diff --git a/gremlin-server/conf/log4j-server.properties 
b/gremlin-server/conf/log4j-server.properties
index 2529887..8bf809c 100644
--- a/gremlin-server/conf/log4j-server.properties
+++ b/gremlin-server/conf/log4j-server.properties
@@ -29,3 +29,4 @@ 
log4j.logger.org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapR
 log4j.logger.org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph=INFO
 
log4j.logger.org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer=INFO
 log4j.logger.org.apache.spark.metrics.MetricsSystem=ERROR
+log4j.logger.com.jcabi.manifests.Manifests=OFF

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 7aefbe6..a402454 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -38,6 +38,7 @@ import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.util.ThreadFactoryUtil;
+import org.apache.tinkerpop.gremlin.util.Gremlin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -370,7 +371,7 @@ public class GremlinServer {
 
 public static String getHeader() {
 final StringBuilder builder = new StringBuilder();
-builder.append("\r\n");
+builder.append(Gremlin.version() + "\r\n");
 builder.append(" \\,,,/\r\n");
 builder.append(" (o o)\r\n");
 builder.append("-oOOo-(3)-oOOo-\r\n");

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

[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/bdec663e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bdec663e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bdec663e

Branch: refs/heads/master
Commit: bdec663e91aab0ffc70e82e6c12e8fca7f2fbed0
Parents: d667735 a4970a4
Author: Stephen Mallette 
Authored: Thu Sep 6 08:24:31 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:24:31 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 gremlin-server/conf/log4j-server.properties   | 1 +
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
--


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

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

[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/a4970a4c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4970a4c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4970a4c

Branch: refs/heads/tp33
Commit: a4970a4c37dd88f006c60c5ba063ec1af8707e29
Parents: 81f2292 c029eef
Author: Stephen Mallette 
Authored: Thu Sep 6 08:24:10 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:24:10 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 gremlin-server/conf/log4j-server.properties   | 1 +
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4970a4c/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--

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

[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/a4970a4c
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4970a4c
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4970a4c

Branch: refs/heads/master
Commit: a4970a4c37dd88f006c60c5ba063ec1af8707e29
Parents: 81f2292 c029eef
Author: Stephen Mallette 
Authored: Thu Sep 6 08:24:10 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:24:10 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 gremlin-server/conf/log4j-server.properties   | 1 +
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
--


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

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a4970a4c/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--

[1/3] tinkerpop git commit: Added gremlin version to gremlin server startup logging output CTR

[spmallette]

Repository: tinkerpop
Updated Branches:
  refs/heads/master d6677350b -> bdec663e9


Added gremlin version to gremlin server startup logging output CTR


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

Branch: refs/heads/master
Commit: c029eef8e9641e9908a09b06d4ec7b3f5236508b
Parents: c36fc5c
Author: Stephen Mallette 
Authored: Thu Sep 6 08:23:44 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Sep 6 08:23:44 2018 -0400

--
 CHANGELOG.asciidoc| 1 +
 gremlin-server/conf/log4j-server.properties   | 1 +
 .../java/org/apache/tinkerpop/gremlin/server/GremlinServer.java   | 3 ++-
 3 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 48f78e4..158cc7a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,6 +24,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 === TinkerPop 3.2.10 (Release Date: NOT OFFICIALLY RELEASED YET)
 
 * SSL security enhancements
+* Added Gremlin version to Gremlin Server startup logging output.
 * Fixed problem with Gremlin Server sometimes returning an additional message 
after a failure.
 * Allowed spaces in classpath for `gremlin-server.bat`.
 * Fixed bug in traversals that used Python lambdas with strategies in 
`gremlin-python`.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/conf/log4j-server.properties
--
diff --git a/gremlin-server/conf/log4j-server.properties 
b/gremlin-server/conf/log4j-server.properties
index 2529887..8bf809c 100644
--- a/gremlin-server/conf/log4j-server.properties
+++ b/gremlin-server/conf/log4j-server.properties
@@ -29,3 +29,4 @@ 
log4j.logger.org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapR
 log4j.logger.org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph=INFO
 
log4j.logger.org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer=INFO
 log4j.logger.org.apache.spark.metrics.MetricsSystem=ERROR
+log4j.logger.com.jcabi.manifests.Manifests=OFF

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c029eef8/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
--
diff --git 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 7aefbe6..a402454 100644
--- 
a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ 
b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -38,6 +38,7 @@ import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
 import org.apache.tinkerpop.gremlin.server.util.MetricManager;
 import org.apache.tinkerpop.gremlin.server.util.ServerGremlinExecutor;
 import org.apache.tinkerpop.gremlin.server.util.ThreadFactoryUtil;
+import org.apache.tinkerpop.gremlin.util.Gremlin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -370,7 +371,7 @@ public class GremlinServer {
 
 public static String getHeader() {
 final StringBuilder builder = new StringBuilder();
-builder.append("\r\n");
+builder.append(Gremlin.version() + "\r\n");
 builder.append(" \\,,,/\r\n");
 builder.append(" (o o)\r\n");
 builder.append("-oOOo-(3)-oOOo-\r\n");