You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/08/22 16:13:22 UTC

[01/18] tinkerpop git commit: Fixed possible classcastexception in groovy ScriptEngine [Forced Update!]

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1753 070da03d9 -> 0ff40539f (forced update)


Fixed possible classcastexception in groovy ScriptEngine

Minor adjustment to exceptions. Without this change you'd end up with a ClassCastExeption and error out, so this shouldn't be adding any new behavior. Logic is the same as before, without the possible failure condition CTR


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

Branch: refs/heads/TINKERPOP-1753
Commit: 43f5afa0725c42bdde72049e5d88720bdce6e787
Parents: ad12776
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Aug 17 15:04:44 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Aug 17 15:04:44 2017 -0400

----------------------------------------------------------------------
 .../groovy/jsr223/GremlinGroovyScriptEngine.java     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/43f5afa0/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
index d52e104..a74d4d9 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/GremlinGroovyScriptEngine.java
@@ -30,6 +30,7 @@ import groovy.lang.MissingMethodException;
 import groovy.lang.MissingPropertyException;
 import groovy.lang.Script;
 import groovy.lang.Tuple;
+import org.apache.commons.lang.exception.ExceptionUtils;
 import org.apache.tinkerpop.gremlin.groovy.CompilerCustomizerProvider;
 import org.apache.tinkerpop.gremlin.groovy.DefaultImportCustomizerProvider;
 import org.apache.tinkerpop.gremlin.groovy.EmptyImportCustomizerProvider;
@@ -580,7 +581,7 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl
     public CompiledScript compile(final String scriptSource) throws ScriptException {
         try {
             return new GroovyCompiledScript(this, getScriptClass(scriptSource));
-        } catch (CompilationFailedException e) {
+        } catch (Exception e) {
             throw new ScriptException(e);
         }
     }
@@ -733,11 +734,19 @@ public class GremlinGroovyScriptEngine extends GroovyScriptEngineImpl
         return classMap.stats().totalLoadTime();
     }
 
-    Class getScriptClass(final String script) throws CompilationFailedException {
+    Class getScriptClass(final String script) throws Exception {
         try {
             return classMap.get(script).get();
         } catch (ExecutionException e) {
-            throw ((CompilationFailedException)e.getCause());
+            final Throwable t = e.getCause();
+
+            // more often than not the cause is a compilation problem but there might be other failures that can
+            // occur in which case, just throw the ExecutionException as-is and let it bubble up as i'm not sure
+            // what the specific handling should be
+            if (t instanceof CompilationFailedException)
+                throw (CompilationFailedException) t;
+            else
+                throw e;
         } catch (InterruptedException e) {
             //This should never happen as the future should completed before it is returned to the us.
             throw new AssertionError();


[13/18] tinkerpop git commit: Added a note to release docs. CTR

Posted by dk...@apache.org.
Added a note to release docs. CTR


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

Branch: refs/heads/TINKERPOP-1753
Commit: 23a0885f07b07ab12f1cbf5ab5ba0d8cfb3a9f0e
Parents: 0c0d34f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 21 13:03:07 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 21 13:03:07 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/23a0885f/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index b28dfa1..32d8beb 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -172,7 +172,9 @@ are additional tests to perform that the release manager feels are relevant, the
 words, there is no need to rebuild the `SNAPSHOT` yet another time unless there are circumstances that would call its
 validity into question.
 . Update `CHANGELOG.asciidoc`:
-.. Update the release date - the release date is the date of the vote.
+.. Update the release date - the release date is the date of the vote. Double check the header to be sure that it is
+formatted properly - the easiest way to is to view the `CHANGELOG.asciidoc` to be sure that it produces a link in the
+GitHub viewer.
 .. Generate the JIRA release notes report for the current version and append them to the `CHANGELOG.asciidoc`.
 ... Use an "advanced" search to filter out JIRA issues already released on other versions. For example:
 `project = TINKERPOP and status = Closed AND fixVersion = 3.2.0 AND fixVersion not in (3.1.3, 3.1.2, 3.1.1, 3.1.0) ORDER BY type, Id ASC`.

[05/18] tinkerpop git commit: Prepping changelog and upgrade docs for 3.1.8 release.

Posted by dk...@apache.org.
Prepping changelog and upgrade docs for 3.1.8 release.


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

Branch: refs/heads/TINKERPOP-1753
Commit: 72ff2cb2c3d75deb107f91eaeb04930d7043a7e7
Parents: 6144dd0
Author: Ted Wilmes <tw...@gmail.com>
Authored: Sun Aug 20 15:22:09 2017 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Sun Aug 20 15:22:09 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                 | 5 ++++-
 docs/src/upgrade/release-3.1.x-incubating.asciidoc | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ff2cb2/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index e2b849c..a1c8361 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,16 +23,19 @@ TinkerPop 3.1.0 (A 187 On The Undercover Gremlinz)
 image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-gangster.png[width=185]
 
 [[release-3-1-8]]
-TinkerPop 3.1.8 (Release Date: NOT OFFICIALLY RELEASED YET)
+TinkerPop 3.1.8 (Release Date: August 21, 2017)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Fixed a `MessageScope` bug in `TinkerGraphComputer`.
 * Fixed a bug in `BigDecimal` divisions in `NumberHelper` that potentially threw an `ArithmeticException`.
+* Non-deserializable exceptions no longer added to ScriptRecordReader IOExceptions.
 
 Bugs
 ^^^^
 
+* TINKERPOP-1519 TinkerGraphComputer doesn't handle multiple MessageScopes in single iteration
 * TINKERPOP-1736 Sack step evaluated by Groovy interprets numbers in an unexpected way
+* TINKERPOP-1754 Spark can not deserialise some ScriptRecordReader parse exceptions
 
 [[release-3-1-7]]
 TinkerPop 3.1.7 (Release Date: June 12, 2017)

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/72ff2cb2/docs/src/upgrade/release-3.1.x-incubating.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/upgrade/release-3.1.x-incubating.asciidoc b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
index 6a7bd55..a0fa300 100644
--- a/docs/src/upgrade/release-3.1.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.1.x-incubating.asciidoc
@@ -25,7 +25,9 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.1.8
 ---------------
 
-*Release Date: NOT OFFICIALLY RELEASED YET*
+*Release Date: August 21, 2017*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.1.8/CHANGELOG.asciidoc#tinkerpop-318-release-date-august-21-2017[changelog] for a complete list of all the modifications that are part of this release.
 
 TinkerPop 3.1.7
 ---------------

[11/18] tinkerpop git commit: Merge branch 'tp31' into tp32

Posted by dk...@apache.org.
Merge branch 'tp31' into tp32


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

Branch: refs/heads/TINKERPOP-1753
Commit: 5357bf6a278266b8da35e172740f9c3c9b8b4438
Parents: 90a2847 77592c7
Author: Ted Wilmes <tw...@gmail.com>
Authored: Mon Aug 21 11:43:51 2017 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Mon Aug 21 11:43:51 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


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


[18/18] tinkerpop git commit: Minor code change for the ever so nitpicky @okram.

Posted by dk...@apache.org.
Minor code change for the ever so nitpicky @okram.


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

Branch: refs/heads/TINKERPOP-1753
Commit: 0ff40539ff3b15c9d059669bebb1975457d59e6a
Parents: 96f1745
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Aug 18 13:48:45 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Aug 22 09:12:59 2017 -0700

----------------------------------------------------------------------
 .../tinkerpop/gremlin/process/traversal/Order.java    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0ff40539/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 3a3ae2b..7c3475a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@ -30,10 +30,9 @@ public enum Order implements Comparator<Object> {
     incr {
         @Override
         public int compare(final Object first, final Object second) {
-            if (first instanceof Number && second instanceof Number) {
-                return NumberHelper.compare((Number) first, (Number) second);
-            }
-            return Comparator.<Comparable>naturalOrder().compare((Comparable) first, (Comparable) second);
+            return first instanceof Number && second instanceof Number
+                    ? NumberHelper.compare((Number) first, (Number) second)
+                    : Comparator.<Comparable>naturalOrder().compare((Comparable) first, (Comparable) second);
         }
 
         @Override
@@ -43,10 +42,9 @@ public enum Order implements Comparator<Object> {
     }, decr {
         @Override
         public int compare(final Object first, final Object second) {
-            if (first instanceof Number && second instanceof Number) {
-                return NumberHelper.compare((Number) second, (Number) first);
-            }
-            return Comparator.<Comparable>reverseOrder().compare((Comparable) first, (Comparable) second);
+            return first instanceof Number && second instanceof Number
+                    ? NumberHelper.compare((Number) second, (Number) first)
+                    : Comparator.<Comparable>reverseOrder().compare((Comparable) first, (Comparable) second);
         }
 
         @Override

[14/18] tinkerpop git commit: Update upgrade docs CTR

Posted by dk...@apache.org.
Update upgrade docs CTR


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

Branch: refs/heads/TINKERPOP-1753
Commit: 9e13ca572d1acacefb2debf242137131b8b5cf29
Parents: 23a0885
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 21 13:07:52 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 21 13:07:52 2017 -0400

----------------------------------------------------------------------
 docs/src/upgrade/release-3.2.x-incubating.asciidoc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9e13ca57/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 18c153b..9c9721f 100644
--- a/docs/src/upgrade/release-3.2.x-incubating.asciidoc
+++ b/docs/src/upgrade/release-3.2.x-incubating.asciidoc
@@ -25,11 +25,13 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 TinkerPop 3.2.6
 ---------------
 
-*Release Date: NOT OFFICIALLY RELEASED YET*
+*Release Date: August 21, 2017*
 
 Upgrading for Users
 ~~~~~~~~~~~~~~~~~~~
 
+Please see the link:https://github.com/apache/tinkerpop/blob/3.2.6/CHANGELOG.asciidoc#release-3-2-6[changelog] for a complete list of all the modifications that are part of this release.
+
 Deprecated useMapperFromGraph
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

[12/18] tinkerpop git commit: Fixed formatting of devs docs

Posted by dk...@apache.org.
Fixed formatting of devs docs

The formulat was interepreted as a asciidoc bold in the document. CTR


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

Branch: refs/heads/TINKERPOP-1753
Commit: 0c0d34f844a21dbb3270561218e10c633fca4c8a
Parents: 5357bf6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 21 13:01:08 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 21 13:01:08 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                      | 38 ++++++++++++++++++++++++++--
 docs/src/dev/developer/release.asciidoc |  2 +-
 2 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c0d34f8/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index fd4caad..a696ea0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -23,8 +23,8 @@ TinkerPop 3.2.0 (Nine Inch Gremlins)
 image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
 
 [[release-3-2-6]]
-TinkerPop 3.2.6 (Release Date: NOT OFFICIALLY RELEASED YET)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+TinkerPop 3.2.6 (Release Date: August 21, 2017)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This release also includes changes from <<release-3-1-8, 3.1.8>>.
 
@@ -54,6 +54,40 @@ This release also includes changes from <<release-3-1-8, 3.1.8>>.
 * Added WsAndHttpChannelizer and SaslAndHttpBasicAuthenticationHandler to be allow for servicing Http and Websocket requests to the same server
 * Added deep copy of `Bytecode` to `DefaultTraversal.clone()`.
 
+Bugs
+^^^^
+
+* TINKERPOP-1385 Refactor Profiling test cases
+* TINKERPOP-1679 Detached side-effects aren't attached when remoted
+* TINKERPOP-1683 AbstractHadoopGraphComputer on Windows
+* TINKERPOP-1691 Some EventStrategyProcessTest assume element state is synced in memory
+* TINKERPOP-1704 XXXTranslators are not being respective of BulkSet and Tree.
+* TINKERPOP-1727 Bytecode object shallow copied when traversals are cloned
+* TINKERPOP-1742 RangeByIsCountStrategy fails for ConnectiveSteps
+* TINKERPOP-1743 LambdaRestrictionStrategy does not catch lambdas passed to sack()
+* TINKERPOP-1744 Gremlin .NET: Exception from sync execution gets wrapped in AggregateException
+
+Improvements
+^^^^^^^^^^^^
+
+* TINKERPOP-741 Remove Options For Transaction Retry
+* TINKERPOP-915 Gremlin Server supports REST and Websockets simultanteously
+* TINKERPOP-920 Test case needed for ensuring same cardinality for key.
+* TINKERPOP-1552 C# Gremlin Language Variant
+* TINKERPOP-1669 EdgeVertexStep should be designed for extension
+* TINKERPOP-1676 Improve GraphSON 2.0 Performance  *(breaking)*
+* TINKERPOP-1688 Include TraversalMetrics annotation in pretty print
+* TINKERPOP-1694 Deprecate useMapperFromGraph
+* TINKERPOP-1701 HaltedTraverserStrategy should recurse into collections for detachment.
+* TINKERPOP-1703 Make EdgeOtherVertexStep non-final
+* TINKERPOP-1708 Add a "Note on Scopes" document
+* TINKERPOP-1709 Add a list of all the steps that support by()/from()/to()/as()/option()
+* TINKERPOP-1710 Add a note on tree() by-modulation and uniqueness of tree branches.
+* TINKERPOP-1714 Gremlin Server scriptEvaluationTimeout should take into account request arrival time
+* TINKERPOP-1718 Deprecate GryoLiteMessageSerializerV1d0
+* TINKERPOP-1748 Callout comments break code snippets
+* TINKERPOP-1749 Bump to Netty 4.0.50
+
 [[release-3-2-5]]
 TinkerPop 3.2.5 (Release Date: June 12, 2017)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0c0d34f8/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index 22a1f01..b28dfa1 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -178,7 +178,7 @@ validity into question.
 `project = TINKERPOP and status = Closed AND fixVersion = 3.2.0 AND fixVersion not in (3.1.3, 3.1.2, 3.1.1, 3.1.0) ORDER BY type, Id ASC`.
 ... Consider use of an "Excel" export to organize and prepare the JIRA tickets to be pasted to `CHANGELOG.asciidoc`.
 This formula can help construct each line item for the CHANGELOG if column `A` is the issue number, `B` is the
-issue title and `D` is the label field: `="* "&A2&" "&B2&(IF(D2="breaking","*(breaking)*",""))`
+issue title and `D` is the label field: `="* "&A2&" "&B2&(IF(D2="breaking"," \*(breaking)*",""))`
 ... Be sure to include a link to other versions in the `CHANGELOG.asciidoc` that were previously released while the
 current release was under development as this new release will have those changes included within it. Please see
 3.2.1 for an example.

[16/18] tinkerpop git commit: CTR: ignore escape sequence warnings in awk script

Posted by dk...@apache.org.
CTR: ignore escape sequence warnings in awk script


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

Branch: refs/heads/TINKERPOP-1753
Commit: 529b819bb3cab5c24e7e61e955450f1d33d59625
Parents: 17f1dc4
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Aug 22 09:11:09 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Aug 22 09:11:09 2017 -0700

----------------------------------------------------------------------
 docs/postprocessor/postprocess.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/529b819b/docs/postprocessor/postprocess.sh
----------------------------------------------------------------------
diff --git a/docs/postprocessor/postprocess.sh b/docs/postprocessor/postprocess.sh
index 8d1fd92..b2d4971 100755
--- a/docs/postprocessor/postprocess.sh
+++ b/docs/postprocessor/postprocess.sh
@@ -24,7 +24,7 @@ TP_VERSION=$(cat pom.xml | grep -A1 '<artifactId>tinkerpop</artifactId>' | grep
 
 if [ -d "target/docs" ]; then
   find target/docs -name index.html | while read file ; do
-    awk -f "docs/postprocessor/processor.awk" "${file}"                   \
+    awk -f "docs/postprocessor/processor.awk" "${file}" 2>/dev/null       \
       | perl -0777 -pe 's/<span class="comment">\/\*\n \*\/<\/span>//igs' \
       | sed "s/x\.y\.z/${TP_VERSION}/g"                                   \
       > "${file}.tmp" && mv "${file}.tmp" "${file}"


[08/18] tinkerpop git commit: Merge branch 'tp31' into tp32

Posted by dk...@apache.org.
Merge branch 'tp31' into tp32


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

Branch: refs/heads/TINKERPOP-1753
Commit: 132ba154bd6a6aa83b159e784157c0336d079bf9
Parents: fa2eebc c1076ed
Author: Ted Wilmes <tw...@gmail.com>
Authored: Mon Aug 21 08:55:45 2017 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Mon Aug 21 08:55:45 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                                 | 5 ++++-
 docs/src/upgrade/release-3.1.x-incubating.asciidoc | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


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


[17/18] tinkerpop git commit: Fixed ordering of collections / streams containing mixed number types.

Posted by dk...@apache.org.
Fixed ordering of collections / streams containing mixed number types.


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

Branch: refs/heads/TINKERPOP-1753
Commit: 96f174504a2201bfd0729a80d034b804f749f576
Parents: 529b819
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Aug 17 06:37:45 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Aug 22 09:12:59 2017 -0700

----------------------------------------------------------------------
 .../gremlin/process/traversal/NumberHelper.java | 34 ++++++++---
 .../gremlin/process/traversal/Order.java        |  6 ++
 .../traversal/step/map/GroovyOrderTest.groovy   | 10 ++++
 .../process/traversal/step/map/OrderTest.java   | 59 ++++++++++++++++++++
 4 files changed, 100 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/96f17450/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
index eec1d9e..a25916b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/NumberHelper.java
@@ -40,7 +40,8 @@ public class NumberHelper {
             (a, b) -> {
                 final byte x = a.byteValue(), y = b.byteValue();
                 return x >= y ? x : y;
-            });
+            },
+            (a, b) -> Byte.compare(a.byteValue(), b.byteValue()));
 
     static final NumberHelper SHORT_NUMBER_HELPER = new NumberHelper(
             (a, b) -> a.shortValue() + b.shortValue(),
@@ -54,7 +55,8 @@ public class NumberHelper {
             (a, b) -> {
                 final short x = a.shortValue(), y = b.shortValue();
                 return x >= y ? x : y;
-            });
+            },
+            (a, b) -> Short.compare(a.shortValue(), b.shortValue()));
 
     static final NumberHelper INTEGER_NUMBER_HELPER = new NumberHelper(
             (a, b) -> a.intValue() + b.intValue(),
@@ -68,7 +70,8 @@ public class NumberHelper {
             (a, b) -> {
                 final int x = a.intValue(), y = b.intValue();
                 return x >= y ? x : y;
-            });
+            },
+            (a, b) -> Integer.compare(a.intValue(), b.intValue()));
 
     static final NumberHelper LONG_NUMBER_HELPER = new NumberHelper(
             (a, b) -> a.longValue() + b.longValue(),
@@ -82,7 +85,8 @@ public class NumberHelper {
             (a, b) -> {
                 final long x = a.longValue(), y = b.longValue();
                 return x >= y ? x : y;
-            });
+            },
+            (a, b) -> Long.compare(a.longValue(), b.longValue()));
 
     static final NumberHelper BIG_INTEGER_NUMBER_HELPER = new NumberHelper(
             (a, b) -> bigIntegerValue(a).add(bigIntegerValue(b)),
@@ -96,7 +100,8 @@ public class NumberHelper {
             (a, b) -> {
                 final BigInteger x = bigIntegerValue(a), y = bigIntegerValue(b);
                 return x.compareTo(y) >= 0 ? x : y;
-            });
+            },
+            (a, b) -> bigIntegerValue(a).compareTo(bigIntegerValue(b)));
 
     static final NumberHelper FLOAT_NUMBER_HELPER = new NumberHelper(
             (a, b) -> a.floatValue() + b.floatValue(),
@@ -110,7 +115,8 @@ public class NumberHelper {
             (a, b) -> {
                 final float x = a.floatValue(), y = b.floatValue();
                 return x >= y ? x : y;
-            });
+            },
+            (a, b) -> Float.compare(a.floatValue(), b.floatValue()));
 
     static final NumberHelper DOUBLE_NUMBER_HELPER = new NumberHelper(
             (a, b) -> a.doubleValue() + b.doubleValue(),
@@ -124,7 +130,8 @@ public class NumberHelper {
             (a, b) -> {
                 final double x = a.doubleValue(), y = b.doubleValue();
                 return x >= y ? x : y;
-            });
+            },
+            (a, b) -> Double.compare(a.doubleValue(), b.doubleValue()));
 
     static final NumberHelper BIG_DECIMAL_NUMBER_HELPER = new NumberHelper(
             (a, b) -> bigDecimalValue(a).add(bigDecimalValue(b)),
@@ -151,7 +158,8 @@ public class NumberHelper {
             (a, b) -> {
                 final BigDecimal x = bigDecimalValue(a), y = bigDecimalValue(b);
                 return x.compareTo(y) >= 0 ? x : y;
-            });
+            },
+            (a, b) -> bigDecimalValue(a).compareTo(bigDecimalValue(b)));
 
     public final BiFunction<Number, Number, Number> add;
     public final BiFunction<Number, Number, Number> sub;
@@ -159,13 +167,15 @@ public class NumberHelper {
     public final BiFunction<Number, Number, Number> div;
     public final BiFunction<Number, Number, Number> min;
     public final BiFunction<Number, Number, Number> max;
+    public final BiFunction<Number, Number, Integer> cmp;
 
     private NumberHelper(final BiFunction<Number, Number, Number> add,
                          final BiFunction<Number, Number, Number> sub,
                          final BiFunction<Number, Number, Number> mul,
                          final BiFunction<Number, Number, Number> div,
                          final BiFunction<Number, Number, Number> min,
-                         final BiFunction<Number, Number, Number> max
+                         final BiFunction<Number, Number, Number> max,
+                         final BiFunction<Number, Number, Integer> cmp
     ) {
         this.add = add;
         this.sub = sub;
@@ -173,6 +183,7 @@ public class NumberHelper {
         this.div = div;
         this.min = min;
         this.max = max;
+        this.cmp = cmp;
     }
 
     public static Class<? extends Number> getHighestCommonNumberClass(final Number... numbers) {
@@ -243,6 +254,11 @@ public class NumberHelper {
         return getHelper(clazz).max.apply(a, b);
     }
 
+    public static Integer compare(final Number a, final Number b) {
+        final Class<? extends Number> clazz = getHighestCommonNumberClass(a, b);
+        return getHelper(clazz).cmp.apply(a, b);
+    }
+
     private static NumberHelper getHelper(final Class<? extends Number> clazz) {
         if (clazz.equals(Byte.class)) {
             return BYTE_NUMBER_HELPER;

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/96f17450/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
index 4e3801a..3a3ae2b 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Order.java
@@ -30,6 +30,9 @@ public enum Order implements Comparator<Object> {
     incr {
         @Override
         public int compare(final Object first, final Object second) {
+            if (first instanceof Number && second instanceof Number) {
+                return NumberHelper.compare((Number) first, (Number) second);
+            }
             return Comparator.<Comparable>naturalOrder().compare((Comparable) first, (Comparable) second);
         }
 
@@ -40,6 +43,9 @@ public enum Order implements Comparator<Object> {
     }, decr {
         @Override
         public int compare(final Object first, final Object second) {
+            if (first instanceof Number && second instanceof Number) {
+                return NumberHelper.compare((Number) second, (Number) first);
+            }
             return Comparator.<Comparable>reverseOrder().compare((Comparable) first, (Comparable) second);
         }
 

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/96f17450/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
index de33944..7708f1a 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
@@ -136,5 +136,15 @@ public abstract class GroovyOrderTest {
         public Traversal<Vertex, String> get_g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name() {
             new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('song').order.by('performances',decr).by('name').range(110, 120).name")
         }
+
+        @Override
+        public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX() {
+            new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').group.by('name').by(__.outE.weight.sum).order(local).by(values)")
+        }
+
+        @Override
+        public Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX() {
+            new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').group.by('name').by(__.outE.weight.sum).unfold.order.by(values, decr)")
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/96f17450/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index 7935252..bbf63ef 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@ -96,6 +96,10 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
 
     public abstract Traversal<Vertex, String> get_g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name();
 
+    public abstract Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX();
+
+    public abstract Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX();
+
     @Test
     @LoadGraphWith(MODERN)
     public void g_V_name_order() {
@@ -374,6 +378,51 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
                 "KNOCKING ON HEAVENS DOOR", "MEMPHIS BLUES"), traversal);
     }
 
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX() {
+        final Traversal<Vertex, Map<String, Number>> traversal = get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX();
+        printTraversalForm(traversal);
+        assertTrue(traversal.hasNext());
+        final Map<String, Number> m = traversal.next();
+        assertFalse(traversal.hasNext());
+        assertEquals(4, m.size());
+        final Iterator<Map.Entry<String, Number>> iterator = m.entrySet().iterator();
+        Map.Entry<String, Number> entry = iterator.next();
+        assertEquals("vadas", entry.getKey());
+        assertEquals(0.0, entry.getValue().doubleValue(), 0.0001);
+        entry = iterator.next();
+        assertEquals("peter", entry.getKey());
+        assertEquals(0.2, entry.getValue().doubleValue(), 0.0001);
+        entry = iterator.next();
+        assertEquals("josh", entry.getKey());
+        assertEquals(1.4, entry.getValue().doubleValue(), 0.0001);
+        entry = iterator.next();
+        assertEquals("marko", entry.getKey());
+        assertEquals(1.9, entry.getValue().doubleValue(), 0.0001);
+    }
+
+    @Test
+    @LoadGraphWith(MODERN)
+    public void g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX() {
+        final Traversal<Vertex, Map.Entry<String, Number>> traversal = get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX();
+        printTraversalForm(traversal);
+        assertTrue(traversal.hasNext());
+        Map.Entry<String, Number> entry = traversal.next();
+        assertEquals("marko", entry.getKey());
+        assertEquals(1.9, entry.getValue().doubleValue(), 0.0001);
+        entry = traversal.next();
+        assertEquals("josh", entry.getKey());
+        assertEquals(1.4, entry.getValue().doubleValue(), 0.0001);
+        entry = traversal.next();
+        assertEquals("peter", entry.getKey());
+        assertEquals(0.2, entry.getValue().doubleValue(), 0.0001);
+        entry = traversal.next();
+        assertEquals("vadas", entry.getKey());
+        assertEquals(0.0, entry.getValue().doubleValue(), 0.0001);
+        assertFalse(traversal.hasNext());
+    }
+
     public static class Traversals extends OrderTest {
 
         @Override
@@ -484,5 +533,15 @@ public abstract class OrderTest extends AbstractGremlinProcessTest {
         public Traversal<Vertex, String> get_g_V_hasLabelXsongX_order_byXperfomances_decrX_byXnameX_rangeX110_120X_name() {
             return g.V().hasLabel("song").order().by("performances", Order.decr).by("name").range(110, 120).values("name");
         }
+
+        @Override
+        public Traversal<Vertex, Map<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_orderXlocalX_byXvaluesX() {
+            return g.V().hasLabel("person").<String, Number>group().by("name").by(outE().values("weight").sum()).order(Scope.local).by(Column.values);
+        }
+
+        @Override
+        public Traversal<Vertex, Map.Entry<String, Number>> get_g_V_hasLabelXpersonX_group_byXnameX_byXoutE_weight_sumX_unfold_order_byXvalues_decrX() {
+            return g.V().hasLabel("person").group().by("name").by(outE().values("weight").sum()).<Map.Entry<String, Number>>unfold().order().by(Column.values, Order.decr);
+        }
     }
 }

[02/18] tinkerpop git commit: TINKERPOP-1754: Do not add non deserialisable exception to ScriptRecordReader IOExceptions

Posted by dk...@apache.org.
TINKERPOP-1754: Do not add non deserialisable exception to ScriptRecordReader IOExceptions


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

Branch: refs/heads/TINKERPOP-1753
Commit: 6144dd044b85ae897af39fae5e72524281944c4f
Parents: 3d8c03b
Author: artemaliev <artem.aliev@gmail,com>
Authored: Fri Aug 18 15:21:23 2017 +0300
Committer: artemaliev <artem.aliev@gmail,com>
Committed: Fri Aug 18 15:21:23 2017 +0300

----------------------------------------------------------------------
 .../gremlin/hadoop/structure/io/script/ScriptRecordReader.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6144dd04/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
index 4cb9100..5d9be00 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
@@ -81,7 +81,7 @@ public final class ScriptRecordReader extends RecordReader<NullWritable, VertexW
             this.parse = String.join("\n", IOUtils.toString(reader), READ_CALL);
             script = ((Compilable) engine).compile(this.parse);
         } catch (ScriptException e) {
-            throw new IOException(e.getMessage(), e);
+            throw new IOException(e.getMessage());
         }
     }
 
@@ -102,7 +102,7 @@ public final class ScriptRecordReader extends RecordReader<NullWritable, VertexW
                     return true;
                 }
             } catch (final ScriptException e) {
-                throw new IOException(e.getMessage(), e);
+                throw new IOException(e.getMessage());
             }
         }
     }


[06/18] tinkerpop git commit: TinkerPop 3.1.8 release

Posted by dk...@apache.org.
TinkerPop 3.1.8 release


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

Branch: refs/heads/TINKERPOP-1753
Commit: a9e69fb05a82a1ab9310ce8591ea10dfa96c6241
Parents: 72ff2cb
Author: Ted Wilmes <tw...@gmail.com>
Authored: Sun Aug 20 15:23:33 2017 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Sun Aug 20 15:23:33 2017 -0500

----------------------------------------------------------------------
 giraph-gremlin/pom.xml                                  | 2 +-
 gremlin-archetype/gremlin-archetype-server/pom.xml      | 2 +-
 gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
 gremlin-archetype/pom.xml                               | 2 +-
 gremlin-console/bin/gremlin.sh                          | 2 +-
 gremlin-console/pom.xml                                 | 2 +-
 gremlin-core/pom.xml                                    | 2 +-
 gremlin-driver/pom.xml                                  | 2 +-
 gremlin-groovy-test/pom.xml                             | 2 +-
 gremlin-groovy/pom.xml                                  | 2 +-
 gremlin-server/pom.xml                                  | 2 +-
 gremlin-shaded/pom.xml                                  | 2 +-
 gremlin-test/pom.xml                                    | 2 +-
 hadoop-gremlin/pom.xml                                  | 2 +-
 neo4j-gremlin/pom.xml                                   | 2 +-
 pom.xml                                                 | 2 +-
 spark-gremlin/pom.xml                                   | 2 +-
 tinkergraph-gremlin/pom.xml                             | 2 +-
 18 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 7540cea..bc28905 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>giraph-gremlin</artifactId>
     <name>Apache TinkerPop :: Giraph Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index 0b8f759..d3991bb 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
 
     <artifactId>gremlin-archetype-server</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index 4b6fc64..7002738 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
 
     <artifactId>gremlin-archetype-tinkergraph</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index ecc1ffd..ced2a92 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
 
     <artifactId>gremlin-archetype</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index 3ed2ff0..ebba75e 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.1.8-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-xx.yy.zz-standalone/bin/gremlin.sh
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 7c83c48..9f77a10 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-console</artifactId>
     <name>Apache TinkerPop :: Gremlin Console</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 9817aab..7f8e902 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-core</artifactId>
     <name>Apache TinkerPop :: Gremlin Core</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index ab94777..4d328a8 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-driver</artifactId>
     <name>Apache TinkerPop :: Gremlin Driver</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index 698bc73..ddf34e2 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-groovy-test</artifactId>
     <name>Apache TinkerPop :: Gremlin Groovy Test</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index a8bc119..52c1663 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-groovy</artifactId>
     <name>Apache TinkerPop :: Gremlin Groovy</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 42f0c91..b0d1b80 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-server</artifactId>
     <name>Apache TinkerPop :: Gremlin Server</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index 021d20f..8d2d8e9 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-shaded</artifactId>
     <name>Apache TinkerPop :: Gremlin Shaded</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index a455a41..a53d970 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>gremlin-test</artifactId>
     <name>Apache TinkerPop :: Gremlin Test</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 79aa1d3..fa4811d 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>hadoop-gremlin</artifactId>
     <name>Apache TinkerPop :: Hadoop Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index 4786b27..2bbf641 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>neo4j-gremlin</artifactId>
     <name>Apache TinkerPop :: Neo4j Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ad77361..5d3b717 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     </parent>
     <groupId>org.apache.tinkerpop</groupId>
     <artifactId>tinkerpop</artifactId>
-    <version>3.1.8-SNAPSHOT</version>
+    <version>3.1.8</version>
     <packaging>pom</packaging>
     <name>Apache TinkerPop</name>
     <description>A Graph Computing Framework</description>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 380ea13..a7c129a 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>spark-gremlin</artifactId>
     <name>Apache TinkerPop :: Spark Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a9e69fb0/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index 3e5a117..749175d 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.1.8-SNAPSHOT</version>
+        <version>3.1.8</version>
     </parent>
     <artifactId>tinkergraph-gremlin</artifactId>
     <name>Apache TinkerPop :: TinkerGraph Gremlin</name>

[10/18] tinkerpop git commit: Fixed asciidoc formatting issue.

Posted by dk...@apache.org.
Fixed asciidoc formatting issue.


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

Branch: refs/heads/TINKERPOP-1753
Commit: 77592c70ece5bff0de3cfe769459e1e467318798
Parents: c1076ed
Author: Ted Wilmes <tw...@gmail.com>
Authored: Mon Aug 21 11:41:56 2017 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Mon Aug 21 11:41:56 2017 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/77592c70/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a1c8361..2124469 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -24,7 +24,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 [[release-3-1-8]]
 TinkerPop 3.1.8 (Release Date: August 21, 2017)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 * Fixed a `MessageScope` bug in `TinkerGraphComputer`.
 * Fixed a bug in `BigDecimal` divisions in `NumberHelper` that potentially threw an `ArithmeticException`.

[07/18] tinkerpop git commit: Fixed bad gremlin.sh link for 3.1.8 release.

Posted by dk...@apache.org.
Fixed bad gremlin.sh link for 3.1.8 release.


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

Branch: refs/heads/TINKERPOP-1753
Commit: c1076ed5d509fd8267736983754dbf6111da974c
Parents: a9e69fb
Author: Ted Wilmes <tw...@gmail.com>
Authored: Mon Aug 21 08:39:23 2017 -0500
Committer: Ted Wilmes <tw...@gmail.com>
Committed: Mon Aug 21 08:39:23 2017 -0500

----------------------------------------------------------------------
 gremlin-console/bin/gremlin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c1076ed5/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index ebba75e..af760da 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-xx.yy.zz-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.1.8-standalone/bin/gremlin.sh
\ No newline at end of file


[03/18] tinkerpop git commit: Made callouts in docs prettier and copy+paste friendly.

Posted by dk...@apache.org.
Made callouts in docs prettier and copy+paste friendly.


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

Branch: refs/heads/TINKERPOP-1753
Commit: 354d59ed58e89bca9af12f60d978c695d30f498a
Parents: 43f5afa
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Wed Aug 16 11:06:55 2017 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Aug 18 14:12:03 2017 -0700

----------------------------------------------------------------------
 docs/postprocessor/processor.awk | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/354d59ed/docs/postprocessor/processor.awk
----------------------------------------------------------------------
diff --git a/docs/postprocessor/processor.awk b/docs/postprocessor/processor.awk
index 9563b05..e640273 100644
--- a/docs/postprocessor/processor.awk
+++ b/docs/postprocessor/processor.awk
@@ -19,13 +19,33 @@
 
 BEGIN {
   firstMatch=1
+  styled=0
 }
 
 /Licensed to the Apache Software Foundation/ {
   isHeader=1
 }
 
-firstMatch || !isHeader
+/<\/style>/ {
+  if (!styled) {
+    print ".invisible {position: absolute; left: 9999px}"
+    styled=1
+  }
+}
+
+!/<span class="comment">/ {
+  if (firstMatch || !isHeader) {
+    print gensub(/(<b class="conum">)\(([0-9]+)\)(<\/b>)/,
+                 "<span class=\"invisible\">//</span>\\1\\2\\3", "g")
+  }
+}
+
+/<span class="comment">/ {
+  if (firstMatch || !isHeader) {
+    print gensub(/<span class="comment">\/\/<\/span>(<b class="conum">)\(([0-9]+)\)(<\/b>)/,
+                 "<span class=\"invisible\">//</span>\\1\\2\\3<span class=\"invisible\">\\\\<\/span>", "g")
+  }
+}
 
 /under the License\./ {
   firstMatch=0


[09/18] tinkerpop git commit: Fixed formatting problem in dev docs CTR

Posted by dk...@apache.org.
Fixed formatting problem in dev docs CTR


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

Branch: refs/heads/TINKERPOP-1753
Commit: 90a2847d13f7ef3e54cb2c4c8de500eec6f6c370
Parents: 132ba15
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 21 10:29:01 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 21 10:29:28 2017 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/90a2847d/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 240d901..870af44 100644
--- a/docs/src/dev/developer/development-environment.asciidoc
+++ b/docs/src/dev/developer/development-environment.asciidoc
@@ -102,8 +102,8 @@ integration tests and therefore must be actively switched on with `-DskipIntegra
 mvn clean install -pl gremlin-console -DskipIntegrationTests=false
 
 [[dotnet-environment]]
-.NET Environment
-~~~~~~~~~~~~~~~~
+DotNet Environment
+~~~~~~~~~~~~~~~~~~
 
 The build optionally requires link:https://www.microsoft.com/net/core[.NET Core SDK] (>=1.1.0) to work with the
 `gremlin-dotnet` module. If .NET Core SDK is not installed, TinkerPop will still build with Maven, but .NET projects


[15/18] tinkerpop git commit: TinkerPop 3.2.6 release

Posted by dk...@apache.org.
TinkerPop 3.2.6 release


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

Branch: refs/heads/TINKERPOP-1753
Commit: 17f1dc4b8a35deab0636ed5dcf6b3832cde6444e
Parents: 9e13ca5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Aug 21 13:12:06 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Aug 21 13:12:06 2017 -0400

----------------------------------------------------------------------
 giraph-gremlin/pom.xml                                  | 2 +-
 gremlin-archetype/gremlin-archetype-dsl/pom.xml         | 2 +-
 gremlin-archetype/gremlin-archetype-server/pom.xml      | 2 +-
 gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml | 2 +-
 gremlin-archetype/pom.xml                               | 2 +-
 gremlin-benchmark/pom.xml                               | 2 +-
 gremlin-console/bin/gremlin.sh                          | 2 +-
 gremlin-console/pom.xml                                 | 2 +-
 gremlin-core/pom.xml                                    | 2 +-
 gremlin-dotnet/pom.xml                                  | 2 +-
 gremlin-dotnet/src/pom.xml                              | 2 +-
 gremlin-dotnet/test/pom.xml                             | 2 +-
 gremlin-driver/pom.xml                                  | 2 +-
 gremlin-groovy-test/pom.xml                             | 2 +-
 gremlin-groovy/pom.xml                                  | 2 +-
 gremlin-python/pom.xml                                  | 2 +-
 gremlin-server/pom.xml                                  | 2 +-
 gremlin-shaded/pom.xml                                  | 2 +-
 gremlin-test/pom.xml                                    | 2 +-
 hadoop-gremlin/pom.xml                                  | 2 +-
 neo4j-gremlin/pom.xml                                   | 2 +-
 pom.xml                                                 | 2 +-
 spark-gremlin/pom.xml                                   | 2 +-
 tinkergraph-gremlin/pom.xml                             | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/giraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/giraph-gremlin/pom.xml b/giraph-gremlin/pom.xml
index 19f1caf..de38765 100644
--- a/giraph-gremlin/pom.xml
+++ b/giraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>giraph-gremlin</artifactId>
     <name>Apache TinkerPop :: Giraph Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-dsl/pom.xml b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
index 7224a09..01b9952 100644
--- a/gremlin-archetype/gremlin-archetype-dsl/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-dsl/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
 
     <artifactId>gremlin-archetype-dsl</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-archetype/gremlin-archetype-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-server/pom.xml b/gremlin-archetype/gremlin-archetype-server/pom.xml
index faadc86..0112d9a 100644
--- a/gremlin-archetype/gremlin-archetype-server/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
 
     <artifactId>gremlin-archetype-server</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
index 5b59efe..941493d 100644
--- a/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
+++ b/gremlin-archetype/gremlin-archetype-tinkergraph/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-archetype</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
 
     <artifactId>gremlin-archetype-tinkergraph</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-archetype/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-archetype/pom.xml b/gremlin-archetype/pom.xml
index 944ec00..810c5a1 100644
--- a/gremlin-archetype/pom.xml
+++ b/gremlin-archetype/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
 
     <artifactId>gremlin-archetype</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-benchmark/pom.xml b/gremlin-benchmark/pom.xml
index a2d411a..c75f37e 100644
--- a/gremlin-benchmark/pom.xml
+++ b/gremlin-benchmark/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
 
     <artifactId>gremlin-benchmark</artifactId>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-console/bin/gremlin.sh
----------------------------------------------------------------------
diff --git a/gremlin-console/bin/gremlin.sh b/gremlin-console/bin/gremlin.sh
index d8c9e95..709e6bb 120000
--- a/gremlin-console/bin/gremlin.sh
+++ b/gremlin-console/bin/gremlin.sh
@@ -1 +1 @@
-../target/apache-tinkerpop-gremlin-console-3.2.6-SNAPSHOT-standalone/bin/gremlin.sh
\ No newline at end of file
+../target/apache-tinkerpop-gremlin-console-3.2.6-standalone/bin/gremlin.sh
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 31a9281..63a5d85 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <artifactId>tinkerpop</artifactId>
         <groupId>org.apache.tinkerpop</groupId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-console</artifactId>
     <name>Apache TinkerPop :: Gremlin Console</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-core/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 7e09198..26a4165 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-core</artifactId>
     <name>Apache TinkerPop :: Gremlin Core</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-dotnet/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index aba4315..3ce3ffa 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-dotnet</artifactId>
     <name>Apache TinkerPop :: Gremlin.Net</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-dotnet/src/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/src/pom.xml b/gremlin-dotnet/src/pom.xml
index d19170d..3749ea3 100644
--- a/gremlin-dotnet/src/pom.xml
+++ b/gremlin-dotnet/src/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-dotnet</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-dotnet-source</artifactId>
     <name>Apache TinkerPop :: Gremlin.Net - Source</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-dotnet/test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/pom.xml b/gremlin-dotnet/test/pom.xml
index ab2a607..ef5b10d 100644
--- a/gremlin-dotnet/test/pom.xml
+++ b/gremlin-dotnet/test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-dotnet</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-dotnet-tests</artifactId>
     <name>Apache TinkerPop :: Gremlin.Net - Tests</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-driver/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-driver/pom.xml b/gremlin-driver/pom.xml
index 0450fcc..360a513 100644
--- a/gremlin-driver/pom.xml
+++ b/gremlin-driver/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-driver</artifactId>
     <name>Apache TinkerPop :: Gremlin Driver</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-groovy-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/pom.xml b/gremlin-groovy-test/pom.xml
index 7007938..4c1e7b5 100644
--- a/gremlin-groovy-test/pom.xml
+++ b/gremlin-groovy-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-groovy-test</artifactId>
     <name>Apache TinkerPop :: Gremlin Groovy Test</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-groovy/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 5a035ab..a13dd8d 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-groovy</artifactId>
     <name>Apache TinkerPop :: Gremlin Groovy</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-python/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index 7fc3d88..ab63cc4 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-python</artifactId>
     <name>Apache TinkerPop :: Gremlin Python</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index aafac6c..ebe810a 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-server</artifactId>
     <name>Apache TinkerPop :: Gremlin Server</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-shaded/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-shaded/pom.xml b/gremlin-shaded/pom.xml
index 0323992..ab1daed 100644
--- a/gremlin-shaded/pom.xml
+++ b/gremlin-shaded/pom.xml
@@ -20,7 +20,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-shaded</artifactId>
     <name>Apache TinkerPop :: Gremlin Shaded</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/gremlin-test/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-test/pom.xml b/gremlin-test/pom.xml
index 4006323..9fda688 100644
--- a/gremlin-test/pom.xml
+++ b/gremlin-test/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>gremlin-test</artifactId>
     <name>Apache TinkerPop :: Gremlin Test</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/pom.xml b/hadoop-gremlin/pom.xml
index 0e00751..4e3b346 100644
--- a/hadoop-gremlin/pom.xml
+++ b/hadoop-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>hadoop-gremlin</artifactId>
     <name>Apache TinkerPop :: Hadoop Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/neo4j-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/neo4j-gremlin/pom.xml b/neo4j-gremlin/pom.xml
index f7a6981..1c5a547 100644
--- a/neo4j-gremlin/pom.xml
+++ b/neo4j-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>neo4j-gremlin</artifactId>
     <name>Apache TinkerPop :: Neo4j Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 187cae6..f469a9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ limitations under the License.
     </parent>
     <groupId>org.apache.tinkerpop</groupId>
     <artifactId>tinkerpop</artifactId>
-    <version>3.2.6-SNAPSHOT</version>
+    <version>3.2.6</version>
     <packaging>pom</packaging>
     <name>Apache TinkerPop</name>
     <description>A Graph Computing Framework</description>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/spark-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/spark-gremlin/pom.xml b/spark-gremlin/pom.xml
index 05e0b2e..05f807f 100644
--- a/spark-gremlin/pom.xml
+++ b/spark-gremlin/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>spark-gremlin</artifactId>
     <name>Apache TinkerPop :: Spark Gremlin</name>

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/17f1dc4b/tinkergraph-gremlin/pom.xml
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/pom.xml b/tinkergraph-gremlin/pom.xml
index a353811..ea5f0d6 100644
--- a/tinkergraph-gremlin/pom.xml
+++ b/tinkergraph-gremlin/pom.xml
@@ -21,7 +21,7 @@ limitations under the License.
     <parent>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkerpop</artifactId>
-        <version>3.2.6-SNAPSHOT</version>
+        <version>3.2.6</version>
     </parent>
     <artifactId>tinkergraph-gremlin</artifactId>
     <name>Apache TinkerPop :: TinkerGraph Gremlin</name>


[04/18] tinkerpop git commit: Merge branch 'tp31' into tp32

Posted by dk...@apache.org.
Merge branch 'tp31' into tp32


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

Branch: refs/heads/TINKERPOP-1753
Commit: fa2eebca547cb008c55976657cc9d7ee8636b6e5
Parents: 354d59e 6144dd0
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 18 22:22:36 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 18 22:22:36 2017 -0400

----------------------------------------------------------------------
 .../gremlin/hadoop/structure/io/script/ScriptRecordReader.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa2eebca/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
----------------------------------------------------------------------
diff --cc hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
index ea72f9a,5d9be00..f119baf
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/structure/io/script/ScriptRecordReader.java
@@@ -105,16 -96,13 +105,16 @@@ public final class ScriptRecordReader e
                  bindings.put(GRAPH, graph);
                  bindings.put(LINE, this.lineRecordReader.getCurrentValue().toString());
                  bindings.put(FACTORY, factory);
 -                final Vertex vertex = (Vertex) script.eval(bindings);
 -                if (vertex != null) {
 -                    this.vertexWritable.set(vertex);
 -                    return true;
 +                final StarGraph.StarVertex sv = (StarGraph.StarVertex) script.eval(bindings);
 +                if (sv != null) {
 +                    final Optional<StarGraph.StarVertex> vertex = sv.applyGraphFilter(this.graphFilter);
 +                    if (vertex.isPresent()) {
 +                        this.vertexWritable.set(vertex.get());
 +                        return true;
 +                    }
                  }
              } catch (final ScriptException e) {
-                 throw new IOException(e.getMessage(), e);
+                 throw new IOException(e.getMessage());
              }
          }
      }