date:20180510

tinkerpop git commit: integrated tabs.css into tinkerpop.css

2018-05-10 Thread dkuppitz

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1447 91f2f9b08 -> 49726b8b6


integrated tabs.css into tinkerpop.css


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

Branch: refs/heads/TINKERPOP-1447
Commit: 49726b8b69fa19bfb63f230e8e874ce2b28a909f
Parents: 91f2f9b
Author: Daniel Kuppitz 
Authored: Thu May 10 17:31:20 2018 -0700
Committer: Daniel Kuppitz 
Committed: Thu May 10 17:31:20 2018 -0700

--
 docs/postprocessor/processor.awk|   4 -
 docs/sass/compile   |   5 +-
 docs/stylesheets/tabs.css   |  19 -
 docs/stylesheets/tinkerpop-base.css | 694 +++
 docs/stylesheets/tinkerpop.css  |   1 +
 5 files changed, 697 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49726b8b/docs/postprocessor/processor.awk
--
diff --git a/docs/postprocessor/processor.awk b/docs/postprocessor/processor.awk
index da82420..18ada47 100644
--- a/docs/postprocessor/processor.awk
+++ b/docs/postprocessor/processor.awk
@@ -33,10 +33,6 @@ BEGIN {
   }
 }
 
-/"
-}
-
 !// {
   if (firstMatch || !isHeader) {
 print gensub(/()\(([0-9]+)\)(<\/b>)/,

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49726b8b/docs/sass/compile
--
diff --git a/docs/sass/compile b/docs/sass/compile
index 002954e..0e0d8e3 100755
--- a/docs/sass/compile
+++ b/docs/sass/compile
@@ -23,8 +23,7 @@ DIR=`dirname $0`
 
 IF="${DIR}/tabs.scss"
 OF="${DIR}/../stylesheets/tabs.css"
-TF=`mktemp`
 
 scss --sourcemap=none -t compressed -C ${IF} ${OF}
-
-cat ${DIR}/../stylesheets/tinkerpop.css | awk 'BEGIN {p=1} {if (p) print} 
/\*\// {p=0}' | cat - ${OF} > ${TF} && mv ${TF} ${OF}
+cat ${DIR}/../stylesheets/tinkerpop-base.css ${OF} > 
${DIR}/../stylesheets/tinkerpop.css
+rm ${OF}

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/49726b8b/docs/stylesheets/tabs.css
--
diff --git a/docs/stylesheets/tabs.css b/docs/stylesheets/tabs.css
deleted file mode 100644
index df508b7..000
--- a/docs/stylesheets/tabs.css
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-.tabs{position:relative;margin:40px 
auto;width:1024px;max-width:100%;overflow:hidden;padding-top:10px;margin-bottom:60px}.tabs
 
input{position:absolute;z-index:1000;height:50px;left:0;top:0;opacity:0;-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";filter:alpha(opacity=0);cursor:pointer;margin:0}.tabs
 input:hover+label{background:#e08f24}.tabs 
label{background:#e9ffe9;color:#1a1a1a;font-size:15px;line-height:50px;height:60px;position:relative;top:0;padding:0
 
20px;float:left;display:block;letter-spacing:1px;text-transform:uppercase;font-weight:bold;text-align:center;box-shadow:2px
 0 2px rgba(0,0,0,0.1),-2px 0 2px 
rgba(0,0,0,0.1);box-sizing:border-box;-webkit-transition:all 150ms ease 
0s;transition:all 150ms ease 0s}.tabs label:hover{cursor:pointer}.tabs 
label:after{content:'';background:#609060;position:absolute;bottom:-2px;left:0;width:100%;height:2px;display:block}.tabs-2
 input{width:50%}.tabs-2 input.tab-selector-1{left:0%}.tabs-2 
input.tab-selector-2{left:50%}.tabs-
 2 label{width:50%}.tabs-3 input{width:33.3%}.tabs-3 
input.tab-selector-1{left:0%}.tabs-3 
input.tab-selector-2{left:33.3%}.tabs-3 
input.tab-selector-3{left:66.7%}.tabs-3 label{width:33.3%}.tabs-4 
input{width:25%}.tabs-4 input.tab-selector-1{left:0%}.tabs-4 
input.tab-selector-2{left:25%}.tabs-4 input.tab-selector-3{left:50%}.tabs-4 
input.tab-selector-4{left:75%}.tabs-4 label{width:25%}.tabs

[1/3] tinkerpop git commit: Minor fix to formatting of header in CHANGELOG CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master c24136a79 -> bcaced4f4


Minor fix to formatting of header in CHANGELOG CTR


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

Branch: refs/heads/master
Commit: ac161fa8cd613f3a0052debd460e5c363777ce2e
Parents: cfbe2ce
Author: Stephen Mallette 
Authored: Thu May 10 11:57:12 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:57:12 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ac161fa8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 18f36ed..62c412e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -2396,7 +2396,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory 
where jars are to be loaded.
 * Updated README with release instructions.
 
-TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
-~
+=== TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
 
 * First official release of TinkerPop3 and thus, no changes.

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

2018-05-10 Thread spmallette

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: b63e2f96a88c4c8f811cd12cfdfe5ac63ad2d4bb
Parents: e574906 ac161fa
Author: Stephen Mallette 
Authored: Thu May 10 11:57:34 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:57:34 2018 -0400

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


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

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

2018-05-10 Thread spmallette

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: bcaced4f4061ff1e0857eb49888ada1ec6f4ebf4
Parents: c24136a b63e2f9
Author: Stephen Mallette 
Authored: Thu May 10 11:57:41 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:57:41 2018 -0400

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


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

tinkerpop git commit: Minor fix to formatting of header in CHANGELOG CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 cfbe2ce7f -> ac161fa8c


Minor fix to formatting of header in CHANGELOG CTR


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

Branch: refs/heads/tp32
Commit: ac161fa8cd613f3a0052debd460e5c363777ce2e
Parents: cfbe2ce
Author: Stephen Mallette 
Authored: Thu May 10 11:57:12 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:57:12 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ac161fa8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 18f36ed..62c412e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -2396,7 +2396,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory 
where jars are to be loaded.
 * Updated README with release instructions.
 
-TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
-~
+=== TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
 
 * First official release of TinkerPop3 and thus, no changes.

[1/2] tinkerpop git commit: Minor fix to formatting of header in CHANGELOG CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 e57490625 -> b63e2f96a


Minor fix to formatting of header in CHANGELOG CTR


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

Branch: refs/heads/tp33
Commit: ac161fa8cd613f3a0052debd460e5c363777ce2e
Parents: cfbe2ce
Author: Stephen Mallette 
Authored: Thu May 10 11:57:12 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:57:12 2018 -0400

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


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ac161fa8/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 18f36ed..62c412e 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -2396,7 +2396,6 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 * Changed `GIRAPH_GREMLIN_HOME` to `GIRAPH_GREMLIN_LIB` to reference directory 
where jars are to be loaded.
 * Updated README with release instructions.
 
-TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
-~
+=== TinkerPop 3.0.0.M1 (Release Date: August 12, 2014)
 
 * First official release of TinkerPop3 and thus, no changes.

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

2018-05-10 Thread spmallette

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: b63e2f96a88c4c8f811cd12cfdfe5ac63ad2d4bb
Parents: e574906 ac161fa
Author: Stephen Mallette 
Authored: Thu May 10 11:57:34 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:57:34 2018 -0400

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


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

tinkerpop git commit: Fixed version typo in upgrade docs CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 fa5e7affe -> e57490625


Fixed version typo in upgrade docs CTR


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

Branch: refs/heads/tp33
Commit: e57490625074457bd771bf326967f9db115706ae
Parents: fa5e7af
Author: Stephen Mallette 
Authored: Thu May 10 11:55:03 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:55:03 2018 -0400

--
 docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e5749062/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc 
b/docs/src/upgrade/release-3.3.x.asciidoc
index e6c15cd..468616b 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -21,7 +21,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 *Gremlin Symphony #40 in G Minor*
 
-== TinkerPop 3.3.2
+== TinkerPop 3.3.3
 
 *Release Date: May 8, 2018*

[1/2] tinkerpop git commit: Fixed version typo in upgrade docs CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master 53e59fa0f -> c24136a79


Fixed version typo in upgrade docs CTR


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

Branch: refs/heads/master
Commit: e57490625074457bd771bf326967f9db115706ae
Parents: fa5e7af
Author: Stephen Mallette 
Authored: Thu May 10 11:55:03 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:55:03 2018 -0400

--
 docs/src/upgrade/release-3.3.x.asciidoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e5749062/docs/src/upgrade/release-3.3.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.3.x.asciidoc 
b/docs/src/upgrade/release-3.3.x.asciidoc
index e6c15cd..468616b 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -21,7 +21,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 *Gremlin Symphony #40 in G Minor*
 
-== TinkerPop 3.3.2
+== TinkerPop 3.3.3
 
 *Release Date: May 8, 2018*

svn commit: r1831351 - /tinkerpop/site/docs/3.3.3/upgrade/index.html

2018-05-10 Thread spmallette

Author: spmallette
Date: Thu May 10 15:51:12 2018
New Revision: 1831351

URL: http://svn.apache.org/viewvc?rev=1831351=rev
Log:
Fixed typo in the version in the TinkerPop upgrade docs

Modified:
tinkerpop/site/docs/3.3.3/upgrade/index.html

Modified: tinkerpop/site/docs/3.3.3/upgrade/index.html
URL: 
http://svn.apache.org/viewvc/tinkerpop/site/docs/3.3.3/upgrade/index.html?rev=1831351=1831350=1831351=diff
==
--- tinkerpop/site/docs/3.3.3/upgrade/index.html (original)
+++ tinkerpop/site/docs/3.3.3/upgrade/index.html Thu May 10 15:51:12 2018
@@ -804,7 +804,7 @@ table.CodeRay td.code>pre{padding:0}
 TinkerPop Upgrade 
Information
 TinkerPop 3.3.0
 
-TinkerPop 3.3.2
+TinkerPop 3.3.3
 
 Upgrading for Users
 
@@ -813,7 +813,7 @@ table.CodeRay td.code>pre{padding:0}
 
 
 
-TinkerPop 3.3.2
+TinkerPop 3.3.2
 
 Upgrading for Users
 
@@ -1305,7 +1305,7 @@ build libraries and other systems on the
 
 
 
-TinkerPop 3.3.2
+TinkerPop 3.3.3
 
 
 Release Date: May 8, 2018
@@ -1341,7 +1341,7 @@ credentials.users(<
 
 
 
-TinkerPop 3.3.2
+TinkerPop 3.3.2
 
 
 Release Date: April 2, 2018

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

2018-05-10 Thread spmallette

Merge branch 'tp32' into tp33


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

Branch: refs/heads/tp33
Commit: fa5e7affe960d762bbcb7f7d8526e13a4fa596d9
Parents: 4e3a0a9 cfbe2ce
Author: Stephen Mallette 
Authored: Thu May 10 11:28:00 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:28:00 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-console/src/main/static/NOTICE
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-server/src/main/static/NOTICE
--

tinkerpop git commit: Missed updating NOTICE files for last two bumps of Groovy CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp32 2f8f74a78 -> cfbe2ce7f


Missed updating NOTICE files for last two bumps of Groovy CTR


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

Branch: refs/heads/tp32
Commit: cfbe2ce7fedb7de07e2c0760ee31f9a8d8a4b60c
Parents: 2f8f74a
Author: Stephen Mallette 
Authored: Thu May 10 11:27:30 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:27:30 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index 4931f7e..f34965b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index 72c10cc..0883bc4 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -11,7 +11,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006

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

2018-05-10 Thread spmallette

Merge branch 'tp33'


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

Branch: refs/heads/master
Commit: 53e59fa0f9bf78bd5d601712e3b7f017c302bd49
Parents: 31d2063 fa5e7af
Author: Stephen Mallette 
Authored: Thu May 10 11:28:15 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:28:15 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--

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

2018-05-10 Thread spmallette

Merge branch 'tp32' into tp33


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

Branch: refs/heads/master
Commit: fa5e7affe960d762bbcb7f7d8526e13a4fa596d9
Parents: 4e3a0a9 cfbe2ce
Author: Stephen Mallette 
Authored: Thu May 10 11:28:00 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:28:00 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-console/src/main/static/NOTICE
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fa5e7aff/gremlin-server/src/main/static/NOTICE
--

[1/2] tinkerpop git commit: Missed updating NOTICE files for last two bumps of Groovy CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/tp33 4e3a0a9bc -> fa5e7affe


Missed updating NOTICE files for last two bumps of Groovy CTR


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

Branch: refs/heads/tp33
Commit: cfbe2ce7fedb7de07e2c0760ee31f9a8d8a4b60c
Parents: 2f8f74a
Author: Stephen Mallette 
Authored: Thu May 10 11:27:30 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:27:30 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index 4931f7e..f34965b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index 72c10cc..0883bc4 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -11,7 +11,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006

[1/3] tinkerpop git commit: Missed updating NOTICE files for last two bumps of Groovy CTR

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/master 31d20633e -> 53e59fa0f


Missed updating NOTICE files for last two bumps of Groovy CTR


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

Branch: refs/heads/master
Commit: cfbe2ce7fedb7de07e2c0760ee31f9a8d8a4b60c
Parents: 2f8f74a
Author: Stephen Mallette 
Authored: Thu May 10 11:27:30 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 11:27:30 2018 -0400

--
 gremlin-console/src/main/static/NOTICE | 2 +-
 gremlin-server/src/main/static/NOTICE  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-console/src/main/static/NOTICE
--
diff --git a/gremlin-console/src/main/static/NOTICE 
b/gremlin-console/src/main/static/NOTICE
index 4931f7e..f34965b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cfbe2ce7/gremlin-server/src/main/static/NOTICE
--
diff --git a/gremlin-server/src/main/static/NOTICE 
b/gremlin-server/src/main/static/NOTICE
index 72c10cc..0883bc4 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -11,7 +11,7 @@ This product includes software from the Spring Framework,
 under the Apache License 2.0 (see: StringUtils.containsWhitespace())
 
 
-Apache Groovy 2.4.11 (AL ASF)
+Apache Groovy 2.4.15 (AL ASF)
 
 This product includes/uses ANTLR (http://www.antlr2.org/)
 developed by Terence Parr 1989-2006

tinkerpop git commit: TINKERPOP-1685 Added supportUpsert() feature

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1685 [created] 384718cdc


TINKERPOP-1685 Added supportUpsert() feature

Added to both VertexFeatures and EdgeFeatures. Gives graph providers a more 
explicit option for providing this type of capability.


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

Branch: refs/heads/TINKERPOP-1685
Commit: 384718cdc93330cad8b2b78a3021220be3c9bebc
Parents: 31d2063
Author: Stephen Mallette 
Authored: Wed Apr 11 07:02:43 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 09:16:19 2018 -0400

--
 CHANGELOG.asciidoc  |  1 +
 docs/src/upgrade/release-3.4.x.asciidoc | 19 ++
 .../tinkerpop/gremlin/structure/Graph.java  | 31 ++
 .../tinkerpop/gremlin/structure/GraphTest.java  | 35 ++-
 .../tinkerpop/gremlin/structure/VertexTest.java | 62 
 5 files changed, 132 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/384718cd/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 0c350c8..b66df78 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ 
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
 
 This release also includes changes from <>.
 
+* Added `supportsUpsert()` option to `VertexFeatures` and `EdgeFeatures`.
 * `min()` and `max()` now support all types implementing `Comparable`.
 * Change the `toString()` of `Path` to be standardized as other graph elements 
are.
 * `hadoop-gremlin` no longer generates a test artifact.

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/384718cd/docs/src/upgrade/release-3.4.x.asciidoc
--
diff --git a/docs/src/upgrade/release-3.4.x.asciidoc 
b/docs/src/upgrade/release-3.4.x.asciidoc
index a3de9e7..3c881c3 100644
--- a/docs/src/upgrade/release-3.4.x.asciidoc
+++ b/docs/src/upgrade/release-3.4.x.asciidoc
@@ -230,3 +230,22 @@ long ago moved to the `Computer` infrastructure as methods 
for constructing a `T
 `TraversalEngine` were long ago removed.
 
 See: link:https://issues.apache.org/jira/browse/TINKERPOP-1143[TINKERPOP-1143]
+
+ Upsert Graph Feature
+
+Some `Graph` implementations may be able to offer upsert functionality for 
vertices and edges, which can help improve
+usability and performance. To help make it clear to users that a graph 
operates in this fashion, the `supportsUpsert()`
+feature has been added to both `Graph.VertexFeatures` and 
`Graph.EdgeFeatures`. By default, both of these methods will
+return `false`.
+
+Should a provider wish to support this feature, the behavior of `addV()` 
and/or `addE()` should change such that when
+a vertex or edge with the same identifier is provided, the respective step 
will insert the new element if that value
+is not present or update an existing element if it is found. The method by 
which the provider "identifies" an element
+is completely up to the capabilities of that provider. In the most simple 
fashion, a graph could simply check the
+value of the supplied `T.id`, however graphs that support some form of schema 
will likely have other methods for
+determining whether or not an existing element is present.
+
+The extent to which TinkerPop tests "upsert" is fairly narrow. Graph providers 
that choose to support this feature
+should consider their own test suites carefully to ensure appropriate coverage.
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1685[TINKERPOP-1685]

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/384718cd/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index b142a9a..494ca8c 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -504,6 +504,7 @@ public interface Graph extends AutoCloseable, Host {
 public static final String FEATURE_DUPLICATE_MULTI_PROPERTIES = 
"DuplicateMultiProperties";
 public static final String FEATURE_META_PROPERTIES = 
"MetaProperties";
 public static final String FEATURE_REMOVE_VERTICES = 
"RemoveVertices";
+

tinkerpop git commit: TINKERPOP-1963 Fixed branch() problems with reducing steps as options [Forced Update!]

2018-05-10 Thread spmallette

Repository: tinkerpop
Updated Branches:
  refs/heads/TINKERPOP-1963 c3aaf8c4d -> ef632522f (forced update)


TINKERPOP-1963 Fixed branch() problems with reducing steps as options


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

Branch: refs/heads/TINKERPOP-1963
Commit: ef632522ffb30f4876916179cf8bae76e17d64a5
Parents: 2f8f74a
Author: Stephen Mallette 
Authored: Wed May 9 17:52:32 2018 -0400
Committer: Stephen Mallette 
Committed: Thu May 10 08:26:03 2018 -0400

--
 .../traversal/step/branch/BranchStep.java   | 39 +---
 .../step/branch/GroovyChooseTest.groovy | 11 ++
 gremlin-test/features/branch/Choose.feature | 27 ++
 .../traversal/step/branch/ChooseTest.java   | 35 ++
 4 files changed, 106 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ef632522/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
--
diff --git 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
index 778722d..9cc875e 100644
--- 
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
+++ 
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/BranchStep.java
@@ -22,6 +22,7 @@ import 
org.apache.tinkerpop.gremlin.process.traversal.Traversal;
 import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
 import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import 
org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.IdentityStep;
 import 
org.apache.tinkerpop.gremlin.process.traversal.step.util.ComputerAwareStep;
 import 
org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
 import 
org.apache.tinkerpop.gremlin.process.traversal.util.FastNoSuchElementException;
@@ -62,7 +63,11 @@ public class BranchStep extends 
ComputerAwareStep implements Trav
 this.traversalOptions.get(pickToken).add(traversalOption);
 else
 this.traversalOptions.put(pickToken, new 
ArrayList<>(Collections.singletonList(traversalOption)));
+
+// adding an IdentityStep acts as a placeholder. see the 
standardAlgorithm for more information.
+traversalOption.addStep(0, new IdentityStep(traversalOption));
 traversalOption.addStep(new EndStep(traversalOption));
+
 if (!this.hasBarrier && 
!TraversalHelper.getStepsOfAssignableClassRecursively(Barrier.class, 
traversalOption).isEmpty())
 this.hasBarrier = true;
 this.integrateChild(traversalOption);
@@ -89,32 +94,54 @@ public class BranchStep extends 
ComputerAwareStep implements Trav
 protected Iterator standardAlgorithm() {
 while (true) {
 if (!this.first) {
+// this block is ignored on the first pass through the 
while(true) giving the opportunity for
+// the traversalOptions to be prepared. Iterate all of them 
and simply return the ones that yield
+// results. applyCurrentTraverser() will have only injected 
the current traverser into the options
+// that met the choice requirements.  Note that in 
addGlobalChildOption an IdentityStep was added to
+// be a holder for that current traverser. That allows us to 
check that first step for an injected
+// traverser as part of the condition for using that traversal 
option in the output. This is necessary
+// because barriers like fold(), max(), etc. will always 
return true for hasNext() even if a traverser
+// was not seeded in applyCurrentTraverser().
 for (final List> options : 
this.traversalOptions.values()) {
 for (final Traversal.Admin option : options) {
-if (option.hasNext())
+if (option.getStartStep().hasNext() && 
option.hasNext())
 return option.getEndStep();
 }
 }
 }
+
 this.first = false;
-///
+
+// pass the current traverser to applyCurrentTraverser() which 
will make

tinkerpop git commit: integrated tabs.css into tinkerpop.css

[1/3] tinkerpop git commit: Minor fix to formatting of header in CHANGELOG CTR

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

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

tinkerpop git commit: Minor fix to formatting of header in CHANGELOG CTR

[1/2] tinkerpop git commit: Minor fix to formatting of header in CHANGELOG CTR

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

tinkerpop git commit: Fixed version typo in upgrade docs CTR

[1/2] tinkerpop git commit: Fixed version typo in upgrade docs CTR

svn commit: r1831351 - /tinkerpop/site/docs/3.3.3/upgrade/index.html

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

tinkerpop git commit: Missed updating NOTICE files for last two bumps of Groovy CTR

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

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

[1/2] tinkerpop git commit: Missed updating NOTICE files for last two bumps of Groovy CTR

[1/3] tinkerpop git commit: Missed updating NOTICE files for last two bumps of Groovy CTR

tinkerpop git commit: TINKERPOP-1685 Added supportUpsert() feature

tinkerpop git commit: TINKERPOP-1963 Fixed branch() problems with reducing steps as options [Forced Update!]

18 matches

Site Navigation

Mail list logo

Footer information