You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2018/04/16 12:26:24 UTC
[01/22] tinkerpop git commit: TINKERPOP-1934 Bumped httpclient to
4.5.5 [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1903 a5532821b -> bad59e502 (forced update)
TINKERPOP-1934 Bumped httpclient to 4.5.5
Removed httpcore NOTICE entry as this more recent version does not contain that designation in its NOTICE file.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f9e0cf50
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f9e0cf50
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f9e0cf50
Branch: refs/heads/TINKERPOP-1903
Commit: f9e0cf50eed22c6e6e54650b073a98e5314888e9
Parents: 1592c4f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 5 08:11:59 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Apr 6 21:28:53 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++++
gremlin-console/pom.xml | 1 -
gremlin-console/src/main/static/NOTICE | 6 ------
gremlin-server/pom.xml | 1 -
pom.xml | 5 +++++
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 2b48a6f..0f3a71a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,6 +20,11 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/nine-inch-gremlins.png[width=185]
+[[release-3-2-9]]
+=== TinkerPop 3.2.9 (Release Date: NOT OFFICIALLY RELEASED YET)
+
+* Bumped to httpclient 4.5.5.
+
[[release-3-2-8]]
=== TinkerPop 3.2.8 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/gremlin-console/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index 46b4fcc..51ad5ca 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -39,7 +39,6 @@ limitations under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.1</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 91e622f..4931f7e 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -29,12 +29,6 @@ Licensed under the Creative Commons Attribution Licence v2.5
http://creativecommons.org/licenses/by/2.5/
------------------------------------------------------------------------
-Apache Http Components Core 4.4.3 (AL ASF)
-------------------------------------------------------------------------
-This project contains annotations derived from JCIP-ANNOTATIONS
-Copyright (c) 2005 Brian Goetz and Tim Peierls. See http://www.jcip.net
-
-------------------------------------------------------------------------
Apache Ivy 2.3.0 (AL ASF)
------------------------------------------------------------------------
Portions of Ivy were originally developed by
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/gremlin-server/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-server/pom.xml b/gremlin-server/pom.xml
index 1bc5920..dd04865 100644
--- a/gremlin-server/pom.xml
+++ b/gremlin-server/pom.xml
@@ -96,7 +96,6 @@ limitations under the License.
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.3.5</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f9e0cf50/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index e99dd5a..5ac2d88 100644
--- a/pom.xml
+++ b/pom.xml
@@ -652,6 +652,11 @@ limitations under the License.
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.5</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
[16/22] tinkerpop git commit: Merge branch 'TINKERPOP-1927' into tp33
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1927' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a4b7ac44
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a4b7ac44
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a4b7ac44
Branch: refs/heads/TINKERPOP-1903
Commit: a4b7ac44725cc7d1322ed65b5330d11c2e45ac38
Parents: cf6f974 2d6c28a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 12 10:29:51 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 12 10:29:51 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 +++++++
.../structure/io/graphson/GraphSONTypeSerializerV3d0.java | 3 ++-
.../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 5 +----
.../Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs | 6 ------
4 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[07/22] tinkerpop git commit: CTR: fixed minor typos in docs
Posted by sp...@apache.org.
CTR: fixed minor typos in docs
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/42bacafb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/42bacafb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/42bacafb
Branch: refs/heads/TINKERPOP-1903
Commit: 42bacafbf4189cfb89ad53f1b38fee9ea21dd64e
Parents: df7870a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Apr 9 11:32:38 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Apr 9 11:32:38 2018 -0700
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/42bacafb/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 69bc8a3..86fb324 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -2342,7 +2342,7 @@ g.V().out().as('a').out().as('b').out().as('c').
by('name')
----
-By using the `from()` and `to()` modulators traversers can ensure that only certain sections of the path are are acyclic.
+By using the `from()` and `to()` modulators traversers can ensure that only certain sections of the path are acyclic.
[gremlin-groovy]
----
@@ -3043,7 +3043,7 @@ of the Gremlin traversal machine's compiler. There are 5 categories of strategie
* There is an application-level feature that can be embedded into the traversal logic (*decoration*).
* There is a more efficient way to express the traversal at the TinkerPop3 level (*optimization*).
* There is a more efficient way to express the traversal at the graph system/language/driver level (*provider optimization*).
- * There are are some final adjustments/cleanups/analyses required before executing the traversal (*finalization*).
+ * There are some final adjustments/cleanups/analyses required before executing the traversal (*finalization*).
* There are certain traversals that are not legal for the application or traversal engine (*verification*).
NOTE: The <<explain-step,`explain()`>>-step shows the user how each registered strategy mutates the traversal.
[04/22] tinkerpop git commit: Fixed up gremlin-javascript deployment
configuration
Posted by sp...@apache.org.
Fixed up gremlin-javascript deployment configuration
Deployment didn't go completely smoothly on 3.2.8/3.3.2. Fixed up the couple of sore spots by adding a alias for the deploy <profile> and ensured that the deploy was not bound to test execution. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/df7870a4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/df7870a4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/df7870a4
Branch: refs/heads/TINKERPOP-1903
Commit: df7870a48acf9d07d0c3a4a437a710339a49bff2
Parents: b84f700
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 9 11:29:14 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 9 11:29:14 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 1 +
gremlin-javascript/pom.xml | 10 +++++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df7870a4/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index b868755..c7c5bb7 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -239,6 +239,7 @@ for generating javadoc and without that the binary distributions won't contain t
.. `mvn clean install -DskipTests -Dnuget`
.. `mvn deploy -pl gremlin-python -DskipTests -Dpypi`
.. `mvn deploy -pl :gremlin-dotnet-source -DskipTests -Dnuget`
+.. `mvn deploy -pl gremlin-javascript -DskipTests -Dnpm`
. `svn co --depth empty https://dist.apache.org/repos/dist/dev/tinkerpop dev; svn up dev/xx.yy.zz`
. `svn co --depth empty https://dist.apache.org/repos/dist/release/tinkerpop release; mkdir release/xx.yy.zz`
. Copy release files from `dev/xx.yy.zz` to `release/xx.yy.zz`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/df7870a4/gremlin-javascript/pom.xml
----------------------------------------------------------------------
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index 6b0d8bf..89fb930 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -269,6 +269,9 @@ limitations under the License.
<id>glv-javascript-deploy</id>
<activation>
<activeByDefault>false</activeByDefault>
+ <property>
+ <name>npm</name>
+ </property>
</activation>
<build>
<plugins>
@@ -289,7 +292,12 @@ limitations under the License.
</execution>
</executions>
<configuration>
- <skip>${skipIntegrationTests}</skip>
+ <!--
+ skip needs to be overridden given how the <configuration> is specified in the main build.
+ it should be fine to just always deploy because this <profile> needs to be manually
+ activated and that should be good enough given our deployment process.
+ -->
+ <skip>false</skip>
<workingDirectory>src/main/javascript/gremlin-javascript</workingDirectory>
<nodeVersion>v6.12.3</nodeVersion>
</configuration>
[13/22] tinkerpop git commit: Fixed a spelling mistake in collections
recipe CTR
Posted by sp...@apache.org.
Fixed a spelling mistake in collections recipe CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/35bf95ad
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/35bf95ad
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/35bf95ad
Branch: refs/heads/TINKERPOP-1903
Commit: 35bf95ad31067a7a7203f21a310dd9d26e371f59
Parents: e1a69fd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 11 09:13:43 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 11 09:13:43 2018 -0400
----------------------------------------------------------------------
docs/src/recipes/collections.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/35bf95ad/docs/src/recipes/collections.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/collections.asciidoc b/docs/src/recipes/collections.asciidoc
index f44040a..d027376 100644
--- a/docs/src/recipes/collections.asciidoc
+++ b/docs/src/recipes/collections.asciidoc
@@ -324,7 +324,7 @@ g.V().
by(values))
----
-The addition steps above `unfold()` the `Map` to key-value entries and filter the values for "n/a" and remove them
+The additional steps above `unfold()` the `Map` to key-value entries and filter the values for "n/a" and remove them
prior to reconstructing the `Map` with the method shown earlier. To go a step further, apply the pattern presented
earlier to flatten `List` values within a `Map`:
[22/22] tinkerpop git commit: TINKERPOP-1903 Migrated Credential DSL
to annotation processor
Posted by sp...@apache.org.
TINKERPOP-1903 Migrated Credential DSL to annotation processor
The old CredentialGraph approach to the Credential DSL has been deprecated in favor of the preferred method for DSL development which was published long after the original DSL was developed.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bad59e50
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bad59e50
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bad59e50
Branch: refs/heads/TINKERPOP-1903
Commit: bad59e50256604939394ec1bace299587db24422
Parents: d63638b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 5 11:51:49 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 16 08:26:11 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../src/reference/gremlin-applications.asciidoc | 31 ++--
docs/src/upgrade/release-3.3.x.asciidoc | 27 ++++
.../jsr223/dsl/credential/CredentialGraph.java | 2 +
.../CredentialGraphGremlinPlugin.java | 6 +-
.../dsl/credential/CredentialTraversalDsl.java | 74 ++++++++++
.../CredentialTraversalSourceDsl.java | 79 ++++++++++
.../dsl/credential/CredentialGraphTest.java | 4 +
.../credential/CredentialTraversalDslTest.java | 143 +++++++++++++++++++
9 files changed, 354 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index a3512ec..45ac72c 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
This release also includes changes from <<release-3-2-9, 3.2.9>>.
* Coerced `BulkSet` to `g:List` in GraphSON 3.0.
+* Deprecated `CredentialsGraph` DSL in favor of `CredentialsTraversalDsl` which uses the recommended method for Gremlin DSL development.
[[release-3-3-2]]
=== TinkerPop 3.3.2 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc
index 53a1642..f87499d 100644
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@ -1351,9 +1351,9 @@ the `Graph`, consider specifying a unique constraint as well.
To aid with the management of a credentials graph, Gremlin Server provides a Gremlin Console plugin which can be
used to add and remove users so as to ensure that the schema is adhered to, thus ensuring compatibility with Gremlin
- Server. In addition, as it is a plugin, it works naturally in the Gremlin Console as an extension of its
- capabilities (though one could use it programmatically, if desired). This plugin is distributed with the Gremlin
- Console so it does not have to be "installed". It does however need to be activated:
+Server. In addition, as it is a plugin, it works naturally in the Gremlin Console as an extension of its
+capabilities (though one could use it programmatically, if desired). This plugin is distributed with the Gremlin
+Console so it does not have to be "installed". It does however need to be activated:
[source,groovy]
gremlin> :plugin use tinkerpop.credentials
@@ -1365,15 +1365,22 @@ Please see the example usage as follows:
----
graph = TinkerGraph.open()
graph.createIndex("username",Vertex.class)
-credentials = credentials(graph)
-credentials.createUser("stephen","password")
-credentials.createUser("daniel","better-password")
-credentials.createUser("marko","rainbow-dash")
-credentials.findUser("marko").properties()
-credentials.countUsers()
-credentials.removeUser("daniel")
-credentials.countUsers()
-----
+credentials = graph.traversal(CredentialTraversalSource.class)
+credentials.user("stephen","password")
+credentials.user("daniel","better-password")
+credentials.user("marko","rainbow-dash")
+credentials.users("marko").valueMap()
+credentials.users().count()
+credentials.users("daniel").drop()
+credentials.users().count()
+----
+
+NOTE: The Credentials DSL is built using TinkerPop's DSL Annotation Processor described <<gremlin-java-dsl,here>>.
+
+IMPORTANT: In the above example, an empty in-memory TinkerGraph was used for demonstrating the API of the DSL.
+Obviously, this data will not be retained and usable with Gremlin Server. It would be important to configure
+TinkerGraph to persist that data or to manually persist it (e.g. write the graph data to Gryo) once changes are
+complete. Alternatively, use a persistent graph to hold the credentials and configure Gremlin Server accordingly.
[[krb5authenticator]]
===== Kerberos Authentication
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/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 9ff7b4d..79b7ef5 100644
--- a/docs/src/upgrade/release-3.3.x.asciidoc
+++ b/docs/src/upgrade/release-3.3.x.asciidoc
@@ -23,6 +23,33 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
== TinkerPop 3.3.2
+*Release Date: NOT OFFICIALLY RELEASED YET*
+
+Please see the link:https://github.com/apache/tinkerpop/blob/3.3.3/CHANGELOG.asciidoc#release-3-3-3[changelog] for a complete list of all the modifications that are part of this release.
+
+=== Upgrading for Users
+
+==== Credential DSL Changes
+
+The Credential DSL has been modified to work as a standard Java-based Gremlin DSL. The now deprecated old approach
+used a "graph wrapping" style that was developed long before the
+link:http://tinkerpop.apache.org/docs/current/reference/#gremlin-java-dsl[recommended method] for building DSLs was
+published. Under this new model, the DSL is initialized via traversal as follows:
+
+[source,java]
+----
+CredentialTraversalSource credentials = graph.traversal(CredentialTraversalSource.class)
+credentials.user("stephen","password").iterate()
+credentials.users("stephen").valueMap().next()
+credentials.users().count().next()
+credentials.users("stephen").drop().iterate()
+----
+
+See: link:https://issues.apache.org/jira/browse/TINKERPOP-1903[TINKERPOP-1903],
+link:http://tinkerpop.apache.org/docs/3.3.2/reference/#security[Reference Documentation - Security]
+
+== TinkerPop 3.3.2
+
*Release Date: April 2, 2018*
Please see the link:https://github.com/apache/tinkerpop/blob/3.3.2/CHANGELOG.asciidoc#release-3-3-2[changelog] for a complete list of all the modifications that are part of this release.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
index 9220282..0ae8e00 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraph.java
@@ -32,7 +32,9 @@ import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.drop;
* {@link Graph} is transactional, new transactions will be started for each method call.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As of release 3.3.3, replaced by {@link CredentialTraversalDsl}.
*/
+@Deprecated
public class CredentialGraph {
private final int BCRYPT_ROUNDS = 4;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphGremlinPlugin.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphGremlinPlugin.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphGremlinPlugin.java
index 7b6bd64..e36dff9 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphGremlinPlugin.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphGremlinPlugin.java
@@ -24,7 +24,8 @@ import org.apache.tinkerpop.gremlin.jsr223.ImportCustomizer;
import org.apache.tinkerpop.gremlin.structure.Graph;
/**
- * Plugin for the "credentials graph". This plugin imports the {@link CredentialGraph} to its environment.
+ * Plugin for the Credentials DSL that helps maintain a list of users and passwords in a graph for use with Gremlin
+ * Server authentication.
*
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@@ -38,6 +39,9 @@ public class CredentialGraphGremlinPlugin extends AbstractGremlinPlugin {
try {
imports = DefaultImportCustomizer.build()
.addClassImports(CredentialGraph.class)
+ .addClassImports(CredentialTraversalDsl.class)
+ .addClassImports(CredentialTraversal.class)
+ .addClassImports(CredentialTraversalSource.class)
.addMethodImports(CredentialGraph.class.getMethod("credentials", Graph.class))
.create();
} catch (Exception ex) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDsl.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDsl.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDsl.java
new file mode 100644
index 0000000..e94720a
--- /dev/null
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDsl.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.mindrot.jbcrypt.BCrypt;
+
+import java.util.Arrays;
+
+import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_PASSWORD;
+import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_USERNAME;
+import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.VERTEX_LABEL_USER;
+
+/**
+ * A DSL for managing a "credentials graph" used by Gremlin Server for simple authentication functions.
+ *
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+@GremlinDsl(traversalSource = "org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialTraversalSourceDsl")
+public interface CredentialTraversalDsl<S,E> extends GraphTraversal.Admin<S,E> {
+ static final int BCRYPT_ROUNDS = 4;
+
+ /**
+ * Finds all users.
+ */
+ public default GraphTraversal<S, Vertex> users() {
+ return (CredentialTraversal<S, Vertex>) hasLabel(VERTEX_LABEL_USER);
+ }
+
+ /**
+ * Finds users by name.
+ */
+ public default GraphTraversal<S, Vertex> users(final String username, final String... more) {
+ if (more.length == 0) {
+ return (CredentialTraversal<S, Vertex>) has(VERTEX_LABEL_USER, PROPERTY_USERNAME, username);
+ }
+
+ final int lastIndex;
+ final String[] usernames = Arrays.copyOf(more, (lastIndex = more.length) + 1);
+ usernames[lastIndex] = username;
+ return (CredentialTraversal<S, Vertex>)has(VERTEX_LABEL_USER, PROPERTY_USERNAME, P.within(usernames));
+ }
+
+ /**
+ * Creates or updates a user.
+ */
+ public default GraphTraversal<S, Vertex> user(final String username, final String password) {
+ return has(VERTEX_LABEL_USER, PROPERTY_USERNAME, username).
+ fold().
+ coalesce(__.unfold(),
+ __.addV(VERTEX_LABEL_USER).property(PROPERTY_USERNAME, username)).
+ property(PROPERTY_PASSWORD, BCrypt.hashpw(password, BCrypt.gensalt(CredentialTraversalDsl.BCRYPT_ROUNDS)));
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalSourceDsl.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalSourceDsl.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalSourceDsl.java
new file mode 100644
index 0000000..68b24b2
--- /dev/null
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalSourceDsl.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential;
+
+import org.apache.tinkerpop.gremlin.process.traversal.P;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.mindrot.jbcrypt.BCrypt;
+
+import java.util.Arrays;
+
+import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_PASSWORD;
+import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_USERNAME;
+import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.VERTEX_LABEL_USER;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class CredentialTraversalSourceDsl extends GraphTraversalSource {
+ public CredentialTraversalSourceDsl(final Graph graph, final TraversalStrategies traversalStrategies) {
+ super(graph, traversalStrategies);
+ }
+
+ public CredentialTraversalSourceDsl(final Graph graph) {
+ super(graph);
+ }
+
+ /**
+ * Finds all users.
+ */
+ public GraphTraversal<Vertex, Vertex> users() {
+ return this.clone().V().hasLabel(VERTEX_LABEL_USER);
+ }
+
+ /**
+ * Finds users by name.
+ */
+ public GraphTraversal<Vertex, Vertex> users(final String username, final String... more) {
+ if (more.length == 0) {
+ return this.clone().V().has(VERTEX_LABEL_USER, PROPERTY_USERNAME, username);
+ }
+
+ final int lastIndex;
+ final String[] usernames = Arrays.copyOf(more, (lastIndex = more.length) + 1);
+ usernames[lastIndex] = username;
+ return this.clone().V().has(VERTEX_LABEL_USER, PROPERTY_USERNAME, P.within(usernames));
+ }
+
+ /**
+ * Creates or updates a user.
+ */
+ public GraphTraversal<Vertex, Vertex> user(final String username, final String password) {
+ return this.clone().V().
+ has(VERTEX_LABEL_USER, PROPERTY_USERNAME, username).
+ fold().
+ coalesce(__.unfold(),
+ __.addV(VERTEX_LABEL_USER).property(PROPERTY_USERNAME, username)).
+ property(PROPERTY_PASSWORD, BCrypt.hashpw(password, BCrypt.gensalt(CredentialTraversalDsl.BCRYPT_ROUNDS)));
+ }
+}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphTest.java
index 3fef17e..7e054ce 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialGraphTest.java
@@ -33,8 +33,12 @@ import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNull;
/**
+ * These tests cover old functionality prior to the new method for DSL implementation.
+ *
* @author Stephen Mallette (http://stephen.genoprime.com)
+ * @deprecated As for release 3.3.3, replaced by {@link CredentialTraversalDslTest}.
*/
+@Deprecated
public class CredentialGraphTest {
@Test
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bad59e50/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDslTest.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDslTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDslTest.java
new file mode 100644
index 0000000..8c5a6bd
--- /dev/null
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/jsr223/dsl/credential/CredentialTraversalDslTest.java
@@ -0,0 +1,143 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential;
+
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.tinkergraph.structure.TinkerGraph;
+import org.junit.Test;
+
+import static org.apache.tinkerpop.gremlin.groovy.jsr223.dsl.credential.CredentialGraphTokens.PROPERTY_USERNAME;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+/**
+ * @author Stephen Mallette (http://stephen.genoprime.com)
+ */
+public class CredentialTraversalDslTest {
+
+ @Test
+ public void shouldCreateUser() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ final Vertex v = g.user("stephen", "secret").next();
+ assertEquals("stephen", v.value("username"));
+ assertEquals("user", v.label());
+ assertNotEquals("secret", v.value("password")); // hashed to something
+ assertThat(v.value("password").toString().length(), greaterThan(0));
+ }
+
+ @Test
+ public void shouldRemoveUser() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ assertThat(graph.vertices().hasNext(), is(false));
+ g.user("stephen", "secret").iterate();
+ assertThat(graph.vertices().hasNext(), is(true));
+
+ g.users("stephen").drop().iterate();
+ assertThat(graph.vertices().hasNext(), is(false));
+ }
+
+ @Test
+ public void shouldNotRemoveUser() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ assertThat(graph.vertices().hasNext(), is(false));
+ g.user("stephen", "secret").iterate();
+ assertThat(graph.vertices().hasNext(), is(true));
+
+ g.users("stephanie").drop().iterate();
+ assertThat(graph.vertices().hasNext(), is(true));
+ }
+
+ @Test
+ public void shouldFindUser() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ assertThat(graph.vertices().hasNext(), is(false));
+ g.user("marko", "secret").iterate();
+ final Vertex stephen = g.user("stephen", "secret").next();
+ g.user("daniel", "secret").iterate();
+ assertThat(graph.vertices().hasNext(), is(true));
+
+ assertEquals(stephen, g.users("stephen").next());
+ }
+
+ @Test
+ public void shouldFindSeveralUsers() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ assertThat(graph.vertices().hasNext(), is(false));
+ g.user("marko", "secret").iterate();
+ g.user("daniel", "secret").iterate();
+ g.user("stephen", "secret").iterate();
+ assertThat(graph.vertices().hasNext(), is(true));
+
+ assertThat(g.users("stephen", "marko").values(PROPERTY_USERNAME).toList(), containsInAnyOrder("stephen", "marko"));
+ }
+
+ @Test
+ public void shouldNotFindUser() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ assertThat(graph.vertices().hasNext(), is(false));
+ g.user("marko", "secret").iterate();
+ g.user("daniel", "secret").iterate();
+ g.user("stephen", "secret").iterate();
+ assertThat(graph.vertices().hasNext(), is(true));
+
+ assertThat(g.users("stephanie").hasNext(), is(false));
+ }
+
+ @Test
+ public void shouldCountUsers() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ assertThat(graph.vertices().hasNext(), is(false));
+ g.user("marko", "secret").iterate();
+ g.user("daniel", "secret").iterate();
+ g.user("stephen", "secret").iterate();
+ assertThat(graph.vertices().hasNext(), is(true));
+
+ assertEquals(3, g.users().count().next().intValue());
+ }
+
+ @Test
+ public void shouldUpdateUser() {
+ final Graph graph = TinkerGraph.open();
+ final CredentialTraversalSource g = graph.traversal(CredentialTraversalSource.class);
+ final Vertex v = g.user("stephen", "secret").next();
+ assertEquals("stephen", v.value("username"));
+ assertEquals("user", v.label());
+ assertNotEquals("secret", v.value("password")); // hashed to something
+ assertThat(v.value("password").toString().length(), greaterThan(0));
+
+ final String hashOfSecret = v.value("password").toString();
+
+ g.user("stephen", "new-secret").iterate();
+
+ assertNotEquals(hashOfSecret, g.users("stephen").values("password").next());
+ assertEquals(1, g.users("stephen").count().next().intValue());
+ }
+}
[11/22] tinkerpop git commit: Fixed a grammar mistake in collections
recipe CTR
Posted by sp...@apache.org.
Fixed a grammar mistake in collections recipe CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e1a69fd8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1a69fd8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1a69fd8
Branch: refs/heads/TINKERPOP-1903
Commit: e1a69fd8075f02ae1f22c4195edd956bf988445a
Parents: 42bacaf
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 11 08:56:22 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 11 09:05:33 2018 -0400
----------------------------------------------------------------------
docs/src/recipes/collections.asciidoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1a69fd8/docs/src/recipes/collections.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/collections.asciidoc b/docs/src/recipes/collections.asciidoc
index 61fee99..f44040a 100644
--- a/docs/src/recipes/collections.asciidoc
+++ b/docs/src/recipes/collections.asciidoc
@@ -64,9 +64,9 @@ g.V().fold().unfold().values('name')
g.V().store('a').cap('a').unfold().values('name')
----
-The above examples show that `unfold()` works quite well when you want don't want to preserve the `List` structure of
-the traverser as it just flattens `List` traversers to the traversal stream. The above examples only have one `List`
-as a result, but consider what happens when there is more than one:
+The above examples show that `unfold()` works quite well when you don't want to preserve the `List` structure of the
+traverser as it just flattens `List` traversers to the traversal stream. The above examples only have one `List` as a
+result, but consider what happens when there is more than one:
[gremlin-groovy,modern]
----
[17/22] tinkerpop git commit: Merge branch 'TINKERPOP-1912' into
TINKERPOP-1912-tp33
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1912' into TINKERPOP-1912-tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c31aa581
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c31aa581
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c31aa581
Branch: refs/heads/TINKERPOP-1903
Commit: c31aa581a87bfa5b6eb635c7eaa35a15ba5afb47
Parents: a4b7ac4 54df6dc
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Apr 12 11:02:30 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Apr 12 11:02:30 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 3 ++-
docs/src/dev/developer/release.asciidoc | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c31aa581/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
[02/22] tinkerpop git commit: The package name should be 'gremlin'
and not 'gremlin-javascript'
Posted by sp...@apache.org.
The package name should be 'gremlin' and not 'gremlin-javascript'
That naming change was missed on 3.2.8/3.3.2 release for some reason. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/84d1bf8f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/84d1bf8f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/84d1bf8f
Branch: refs/heads/TINKERPOP-1903
Commit: 84d1bf8fc3e780a1819efeef6b7f6b2253d5c472
Parents: 1592c4f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 9 11:07:55 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 9 11:07:55 2018 -0400
----------------------------------------------------------------------
gremlin-javascript/glv/PackageJson.template | 2 +-
.../src/main/javascript/gremlin-javascript/README.md | 2 +-
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84d1bf8f/gremlin-javascript/glv/PackageJson.template
----------------------------------------------------------------------
diff --git a/gremlin-javascript/glv/PackageJson.template b/gremlin-javascript/glv/PackageJson.template
index c929e75..b87bdd1 100644
--- a/gremlin-javascript/glv/PackageJson.template
+++ b/gremlin-javascript/glv/PackageJson.template
@@ -18,7 +18,7 @@
under the License.
*/
%>{
- "name": "gremlin-javascript",
+ "name": "gremlin",
"version": "<%= version %>",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84d1bf8f/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md b/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
index 388e175..6c5638d 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
@@ -29,7 +29,7 @@ property graph.
Gremlin-Javascript implements Gremlin within the JavaScript language and can be used on Node.js.
```bash
-npm install gremlin-javascript
+npm install gremlin
```
Please see the [reference documentation][docs] at Apache TinkerPop for more information.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/84d1bf8f/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --git a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index d20be6a..9a6197c 100644
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@ -1,5 +1,5 @@
{
- "name": "gremlin-javascript",
+ "name": "gremlin",
"version": "3.2.9-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
[14/22] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cf6f9746
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cf6f9746
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cf6f9746
Branch: refs/heads/TINKERPOP-1903
Commit: cf6f9746e3427f6c9cbc5c48d1153b2b523f5880
Parents: 0c9afb6 35bf95a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 11 09:14:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 11 09:14:00 2018 -0400
----------------------------------------------------------------------
docs/src/recipes/collections.asciidoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[12/22] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0c9afb61
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0c9afb61
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0c9afb61
Branch: refs/heads/TINKERPOP-1903
Commit: 0c9afb614bd79bc48d02cf63f94e8942c8a577e1
Parents: 0f08514 e1a69fd
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 11 09:05:46 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 11 09:05:46 2018 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/22] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Conflicts:
gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/46be1351
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/46be1351
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/46be1351
Branch: refs/heads/TINKERPOP-1903
Commit: 46be13518fd32a58118f1fa09a52e794114fb765
Parents: 39c3365 df7870a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 9 11:31:25 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 9 11:31:25 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 5 +++++
gremlin-javascript/glv/PackageJson.template | 2 +-
gremlin-javascript/pom.xml | 10 +++++++++-
.../src/main/javascript/gremlin-javascript/README.md | 2 +-
.../src/main/javascript/gremlin-javascript/package.json | 2 +-
5 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/46be1351/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
----------------------------------------------------------------------
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
index 004f307,9a6197c..76a2dd6
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/package.json
@@@ -1,6 -1,6 +1,6 @@@
{
- "name": "gremlin-javascript",
+ "name": "gremlin",
- "version": "3.2.9-alpha1",
+ "version": "3.3.3-alpha1",
"description": "JavaScript Gremlin Language Variant",
"author": "Apache TinkerPop team",
"keywords": [
[21/22] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d63638b8
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d63638b8
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d63638b8
Branch: refs/heads/TINKERPOP-1903
Commit: d63638b83f8cfeb4b07410c741ea4f3918e84575
Parents: 01c8954 a7c8ea1
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 16 07:49:03 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 16 07:49:03 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++++
gremlin-console/pom.xml | 1 -
gremlin-console/src/main/static/NOTICE | 6 ------
gremlin-server/pom.xml | 1 -
pom.xml | 5 +++++
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-console/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-console/src/main/static/NOTICE
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/gremlin-server/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d63638b8/pom.xml
----------------------------------------------------------------------
[09/22] tinkerpop git commit: Fixed a grammar mistake in collections
recipe CTR
Posted by sp...@apache.org.
Fixed a grammar mistake in collections recipe CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/da05f940
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/da05f940
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/da05f940
Branch: refs/heads/TINKERPOP-1903
Commit: da05f9401100bb985c0697d06cb1a0487b14275f
Parents: df7870a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 11 08:56:22 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 11 08:56:22 2018 -0400
----------------------------------------------------------------------
docs/src/recipes/collections.asciidoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/da05f940/docs/src/recipes/collections.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/recipes/collections.asciidoc b/docs/src/recipes/collections.asciidoc
index 61fee99..f44040a 100644
--- a/docs/src/recipes/collections.asciidoc
+++ b/docs/src/recipes/collections.asciidoc
@@ -64,9 +64,9 @@ g.V().fold().unfold().values('name')
g.V().store('a').cap('a').unfold().values('name')
----
-The above examples show that `unfold()` works quite well when you want don't want to preserve the `List` structure of
-the traverser as it just flattens `List` traversers to the traversal stream. The above examples only have one `List`
-as a result, but consider what happens when there is more than one:
+The above examples show that `unfold()` works quite well when you don't want to preserve the `List` structure of the
+traverser as it just flattens `List` traversers to the traversal stream. The above examples only have one `List` as a
+result, but consider what happens when there is more than one:
[gremlin-groovy,modern]
----
[20/22] tinkerpop git commit: Merge branch 'TINKERPOP-1934' into tp32
Posted by sp...@apache.org.
Merge branch 'TINKERPOP-1934' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a7c8ea10
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a7c8ea10
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a7c8ea10
Branch: refs/heads/TINKERPOP-1903
Commit: a7c8ea102425e9df5f9f3eca20df333db8cdf936
Parents: 54df6dc f9e0cf5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 16 07:48:42 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 16 07:48:42 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +++++
gremlin-console/pom.xml | 1 -
gremlin-console/src/main/static/NOTICE | 6 ------
gremlin-server/pom.xml | 1 -
pom.xml | 5 +++++
5 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[10/22] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0f085146
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0f085146
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0f085146
Branch: refs/heads/TINKERPOP-1903
Commit: 0f085146135b109a70821da699ca502c52fb375c
Parents: aa40dfa da05f94
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Apr 11 08:57:02 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Apr 11 08:57:02 2018 -0400
----------------------------------------------------------------------
docs/src/recipes/collections.asciidoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[18/22] tinkerpop git commit: TINKERPOP-1912 Updated signature
verification instructions on download page.
Posted by sp...@apache.org.
TINKERPOP-1912 Updated signature verification instructions on download page.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5f815045
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5f815045
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5f815045
Branch: refs/heads/TINKERPOP-1903
Commit: 5f81504565783d106a934d35b24ef3fac78a7450
Parents: c31aa58
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Apr 12 11:04:22 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Apr 12 11:04:22 2018 -0700
----------------------------------------------------------------------
docs/site/home/downloads.html | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5f815045/docs/site/home/downloads.html
----------------------------------------------------------------------
diff --git a/docs/site/home/downloads.html b/docs/site/home/downloads.html
index efe3ac8..f5f0ab3 100644
--- a/docs/site/home/downloads.html
+++ b/docs/site/home/downloads.html
@@ -491,7 +491,7 @@ limitations under the License.
</table>
<p><strong>Note</strong> that upgrade documentation was only introduced at 3.1.1-incubating which is why there are no links "upgrade" links in versions prior to that one.
<h4>Verifying Downloads</h4>
- <p>All downloads have associated PGP and MD5 signatures to help verify a distribution provided by a mirror. To verify a distribution via PGP or GPG first download the
+ <p>All downloads have associated PGP and SHA1 signatures to help verify a distribution provided by a mirror. To verify a distribution via PGP or GPG first download the
<a href="https://www.apache.org/dist/tinkerpop/KEYS">KEYS</a> file (it is important to use the linked file which is from the main distribution directory and not a
mirror. Next download the appropriate "asc" signature file for the relevant distribution (again, this file should come from the <a href="https://www.apache.org/dist/tinkerpop/">main
distribution directory</a> - note that older releases will have such files in the <a href="https://archive.apache.org/dist/tinkerpop/">archives</a> or if released under Apache
@@ -517,7 +517,7 @@ limitations under the License.
gpg --verify apache-gremlin-console-x.y.z-bin.zip.asc apache-gremlin-console-x.y.z-bin.zip
</code></pre>
</p>
- <p>Alternatively, consider verifying the MD5 signature on the files. An MD5 signature consists of 32 hex characters, and a SHA1 signature consists of 40 hex characters.
+ <p>Alternatively, consider verifying the SHA1 signature on the files. An SHA1 signature consists of 40 hex characters.
Ensure that the generated signature string matches the signature string published in the files above.</p>
</div>
</div>
[06/22] tinkerpop git commit: TINKERPOP-1927 Coerced BulkSet to
g:List in GraphSON 3.0
Posted by sp...@apache.org.
TINKERPOP-1927 Coerced BulkSet to g:List in GraphSON 3.0
Since GLVs don't have BulkSet infrastructure and the need to include it doesn't seem high the most direct fix here is to coerce to g:List as the behavior for BulkSet iteration is basically that same as a List.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2d6c28a4
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2d6c28a4
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2d6c28a4
Branch: refs/heads/TINKERPOP-1903
Commit: 2d6c28a4781786238866bbc942d7706e16ec628e
Parents: 46be135
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 5 08:59:56 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 9 14:06:00 2018 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 +++++++
.../structure/io/graphson/GraphSONTypeSerializerV3d0.java | 3 ++-
.../Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs | 5 +----
.../Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs | 6 ------
4 files changed, 10 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d6c28a4/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index d07cea8..ad9085a 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -20,6 +20,13 @@ limitations under the License.
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/images/gremlin-mozart.png[width=185]
+[[release-3-3-3]]
+=== TinkerPop 3.3.3 (Release Date: NOT OFFICIALLY RELEASED YET)
+
+This release also includes changes from <<release-3-2-9, 3.2.9>>.
+
+* Coerced `BulkSet` to `g:List` in GraphSON 3.0.
+
[[release-3-3-2]]
=== TinkerPop 3.3.2 (Release Date: April 2, 2018)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d6c28a4/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
index 3bdbc71..2cd57dc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONTypeSerializerV3d0.java
@@ -26,6 +26,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.SackFunctions;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalOptionParent;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.BulkSet;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.Tree;
import org.apache.tinkerpop.gremlin.process.traversal.util.Metrics;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMetrics;
@@ -124,7 +125,7 @@ public class GraphSONTypeSerializerV3d0 extends AbstractGraphSONTypeSerializer {
mapped = Tree.class;
else
mapped = Map.class;
- } else if (List.class.isAssignableFrom(c))
+ } else if (List.class.isAssignableFrom(c) || BulkSet.class.isAssignableFrom(c)) // coerce BulkSet to List as their behavior on iteration is identical
mapped = List.class;
else if (Set.class.isAssignableFrom(c))
mapped = Set.class;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d6c28a4/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 68d10fe..6d38ccc 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -38,10 +38,7 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
public class GherkinTestRunner
{
private static readonly IDictionary<string, IgnoreReason> IgnoredScenarios =
- new Dictionary<string, IgnoreReason>
- {
- {"g_V_storeXaX_byXoutEXcreatedX_countX_out_out_storeXaX_byXinEXcreatedX_weight_sumX", IgnoreReason.ReceivedDataDoesntMatchExpected}
- };
+ new Dictionary<string, IgnoreReason>();
private static class Keywords
{
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d6c28a4/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
index 711fc20..d5d6dfd 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/IgnoreException.cs
@@ -40,15 +40,9 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
string reasonSuffix = null;
switch (reason)
{
- case IgnoreReason.TraversalTDeserializationNotSupported:
- reasonSuffix = " as deserialization of g:T on GraphSON3 is not supported";
- break;
case IgnoreReason.NoReason:
reasonSuffix = "";
break;
- case IgnoreReason.ReceivedDataDoesntMatchExpected:
- reasonSuffix = " because received data from server doesn't match expected data.";
- break;
}
return $"Scenario ignored" + reasonSuffix;
}
[03/22] tinkerpop git commit: Minor fixes to dev release docs around
gremlin-javascript CTR
Posted by sp...@apache.org.
Minor fixes to dev release docs around gremlin-javascript CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/b84f700d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b84f700d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b84f700d
Branch: refs/heads/TINKERPOP-1903
Commit: b84f700d41ab5ab2e5b383701804bb7556e337e6
Parents: 84d1bf8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 9 11:20:06 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 9 11:20:06 2018 -0400
----------------------------------------------------------------------
docs/src/dev/developer/release.asciidoc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b84f700d/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index fab9819..b868755 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -234,7 +234,7 @@ for generating javadoc and without that the binary distributions won't contain t
== Release & Promote
. Login to link:https://repository.apache.org/[Apache Nexus] and release the previously closed repository.
-. Deploy to link:https://pypi.python.org/pypi[pypi]
+. Deploy the GLVs
.. This build will likely occur from the tag for the release, so be sure to checkout the tag first before executing this step.
.. `mvn clean install -DskipTests -Dnuget`
.. `mvn deploy -pl gremlin-python -DskipTests -Dpypi`
@@ -372,5 +372,9 @@ https://pypi.python.org/pypi/gremlinpython/xx.yy.zz
https://www.nuget.org/packages/Gremlin.Net/xx.yy.zz
+Javascript artifacts are available in npm:
+
+https://www.npmjs.com/package/gremlin
+
[include the release line logo image]
----
[15/22] tinkerpop git commit: TINKERPOP-1912 Removed MD5 checksums
from release
Posted by sp...@apache.org.
TINKERPOP-1912 Removed MD5 checksums from release
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/54df6dcb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/54df6dcb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/54df6dcb
Branch: refs/heads/TINKERPOP-1903
Commit: 54df6dcbd081ec685723cdfc508af5513fb66dd0
Parents: 35bf95a
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Apr 10 13:31:47 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Wed Apr 11 09:27:19 2018 -0700
----------------------------------------------------------------------
bin/validate-distribution.sh | 3 ++-
docs/src/dev/developer/release.asciidoc | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/54df6dcb/bin/validate-distribution.sh
----------------------------------------------------------------------
diff --git a/bin/validate-distribution.sh b/bin/validate-distribution.sh
index 0121a1a..b071ea0 100755
--- a/bin/validate-distribution.sh
+++ b/bin/validate-distribution.sh
@@ -83,10 +83,11 @@ fi
echo -n "* downloading ${COMPONENT} (${ZIP_FILENAME})... "
curl -Lsf ${URL} -o ${ZIP_FILENAME} || { echo "Failed to download ${COMPONENT}" ; exit 1; }
-for ext in "asc" "md5" "sha1"
+for ext in "asc" "sha1"
do
curl -Lsf ${URL}.${ext} -o ${ZIP_FILENAME}.${ext} || { echo "Failed to download ${COMPONENT} (${ext})" ; exit 1 ; }
done
+curl -Lsf ${URL}.md5 -o ${ZIP_FILENAME}.md5 && { echo "MD5 checksums should not be released (${ZIP_FILENAME}.md5)" ; exit 1 ; }
echo "OK"
# validate zip file
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/54df6dcb/docs/src/dev/developer/release.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/dev/developer/release.asciidoc b/docs/src/dev/developer/release.asciidoc
index c7c5bb7..608bb31 100644
--- a/docs/src/dev/developer/release.asciidoc
+++ b/docs/src/dev/developer/release.asciidoc
@@ -209,6 +209,7 @@ for generating javadoc and without that the binary distributions won't contain t
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-console/xx.yy.zz/gremlin-console-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/gremlin-server/xx.yy.zz/gremlin-server-xx.yy.zz-distribution.zip* dev/xx.yy.zz`
.. `cp ~/.m2/repository/org/apache/tinkerpop/tinkerpop/xx.yy.zz/tinkerpop-xx.yy.zz-source-release.zip* dev/xx.yy.zz`
+.. `rm -f dev/*.md5
.. `cd dev/xx.yy.zz`
.. pass:[<code>ls * | xargs -n1 -I {} echo "mv apache-tinkerpop-{} {}" | sed -e 's/distribution/bin/' -e 's/source-release/src/' -e 's/tinkerpop-tinkerpop/tinkerpop/' -e s'/^\(.*\) \(.*\) \(.*\)$/\1 \3 \2/' | /bin/bash</code>]
.. `cd ..; svn add xx.yy.zz/; svn ci -m "TinkerPop xx.yy.zz release"`
[08/22] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aa40dfa6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aa40dfa6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aa40dfa6
Branch: refs/heads/TINKERPOP-1903
Commit: aa40dfa6e4240917e67077e315833ecedfde7e0b
Parents: 46be135 42bacaf
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Apr 9 11:32:52 2018 -0700
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Apr 9 11:32:52 2018 -0700
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/aa40dfa6/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
[19/22] tinkerpop git commit: set version on
build-helper-maven-plugin to stabalize maven build - CTR
Posted by sp...@apache.org.
set version on build-helper-maven-plugin to stabalize maven build - CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/01c89549
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/01c89549
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/01c89549
Branch: refs/heads/TINKERPOP-1903
Commit: 01c89549bf9e036c40c53245adb523b6cd85926a
Parents: 5f81504
Author: Robert Dale <ro...@gmail.com>
Authored: Sat Apr 14 20:35:49 2018 -0400
Committer: Robert Dale <ro...@gmail.com>
Committed: Sat Apr 14 20:35:49 2018 -0400
----------------------------------------------------------------------
pom.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/01c89549/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 17fdec8..9ffd294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -357,6 +357,7 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+ <version>3.0.0</version>
<executions>
<execution>
<id>parse-version</id>