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 2019/10/03 16:41:37 UTC
[tinkerpop] branch TINKERPOP-2076 updated (6a087e9 -> c34a384)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
discard 6a087e9 TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11
discard 6caafc9 TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade
discard 835a862 TINKERPOP-2076 Made expectations around mock more explicit
discard b8d9d11 TINKERPOP-2076 Bumped Hadoop to 2.7.7
discard 92af534 TINKERPOP-2076 Backport 759d1a724eef3f76b48508ba8c49dcb992eff28f from Groovy 2.5.3 upgrade
discard 5a311bc TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
add 5014138 fix GraphStep.ids null bug
add ba562d1 Updated CHANGELOG CTR
add 4e9639f Use ip address instead of hostname for connection
add 25bb663 Merge branch 'pr-1182' into tp33
add 4790fea Updated CHANGELOG CTR
add 91f0265 Isolate PowerMock to gremlin-driver.
add 20fcff7 Code formatting CTR
add 12a8bdf TINKERPOP-2291 Added GraphSON support for deserialization of TraversalExplanation
add dd14552 Merge branch 'TINKERPOP-2291' into tp33
add 29e6131 TINKERPOP-2046 Gremlin-Python: Add support for custom request headers in WebSocket request
add 5ab245c Updated changelog CTR
add 6555210 TINKERPOP-2159 Fixed multi-valued property handling in EventStrategy / AddPropertyStep.
add 41ddc88 TINKERPOP-2132 Trigger authentication early to avoid unauthorized responses
add a55df6a transport tests from branch TINKERPOP-2132
add 52d604d Replace TimeoutException with NoHostAvailableException
add 761a079 Merge branch 'pr-1187' into tp33
add a075038 Minor text fixes CTR
add 2d5cb47 Added upgrade docs and changelog entry CTR
add fec2522 TINKERPOP-2132 Preserved original error messaging prior to #1187
add d7dd67f TINKERPOP-2285 Added ResponseError in gremlin-javascript
add 429ff28 TINKERPOP-2213 Deprecated scriptEvaluationTimeout for evaluationTimeout
add b6e36d8 Fix javadoc to be less "script" oriented now that scriptEvaluationTimeout has been deprecated CTR
add 79ce819 Return a 597 error code for lambda compilation problems.
add 0ac7f3a TINKERPOP-1810 Support for withSack() that use Lambdas with remotes
add 49bab07 Merge branch 'TINKERPOP-1810' into tp33
add 1969c60 Minor tweaks to dev docs on build commands CTR
add 1d4dcb0 TINKERPOP-2280 Add ReservedKeysVerificationStrategy
add 13b60a6 Merge branch 'TINKERPOP-2280' into tp33
add ea0d598 Revert "Replace TimeoutException with NoHostAvailableException"
add ed72e81 Merge branch 'TINKERPOP-2132-revert' into tp33
add 9950746 TINKERPOP-2297 ReeservedKeysVerificationStrategy registered for derser
add 54cf91d Upgrade commons-compress to version 1.19 due to CVE-2018-11771
add 06d7dd8 Merge branch 'pr-1199' into tp33
add aa955d5 Upgraded jackson-databind to 2.9.10 due to CVE-14379, CVE-2019-14540, CVE-2019-16335. Adjusted Dependency convergence errors due to the upgrade of jackson-databind. Aligned jackson-annotations to 2.9.10. Aligned jackson-module-scala_2.11 to 2.9.10. Bumped scala-library and scala-reflect to 2.11.12 due to the upgrade of jackson-module-scala_2.11.
add e8e217a Merge branch 'pr-1200' into tp33
add c0c2d0c Fix Bytecode.addSource arguments is null bug
add 075971f Merge branch 'pr-1197' into tp33
add 6de492e Updated changelog CTR
add 5c6573d Changed license header to use a comment rather than a docstring
add c05b9de TINKERPOP-2293 Improved landing pages for all GLVs
add e4da5eb Update gremlin-javascript/src/main/javascript/gremlin-javascript/README.md
add 268ddda Update gremlin-python/src/main/jython/README
add 9176c3b Added changes to .NET landing page csproj template.
add 4c9e0f9 Merge branch 'TINKERPOP-2293' into tp33
new ed15b99 TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
new 38f01e8 TINKERPOP-2076 Backport 759d1a724eef3f76b48508ba8c49dcb992eff28f from Groovy 2.5.3 upgrade
new b918c34 TINKERPOP-2076 Bumped Hadoop to 2.7.7
new fd85f60 TINKERPOP-2076 Made expectations around mock more explicit
new 90203e4 TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade
new c34a384 TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6a087e9)
\
N -- N -- N refs/heads/TINKERPOP-2076 (c34a384)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 28 +++++-
.../dev/developer/development-environment.asciidoc | 3 +-
docs/src/dev/provider/index.asciidoc | 4 +-
docs/src/reference/gremlin-applications.asciidoc | 8 +-
docs/src/reference/gremlin-variants.asciidoc | 21 +++-
docs/src/reference/the-traversal.asciidoc | 6 ++
docs/src/upgrade/release-3.3.x.asciidoc | 74 ++++++++++++++
giraph-gremlin/pom.xml | 2 +-
.../src/test/resources/gremlin-server.yaml | 2 +-
.../console/jsr223/gremlin-server-integration.yaml | 2 +-
.../gremlin/process/traversal/Bytecode.java | 18 ++--
.../process/traversal/step/map/GraphStep.java | 18 ++--
.../traversal/step/sideEffect/AddPropertyStep.java | 77 +++++++++-----
.../AbstractWarningVerificationStrategy.java | 111 ++++++++++++++++++++
.../EdgeLabelVerificationStrategy.java | 69 ++-----------
.../ReservedKeysVerificationStrategy.java | 106 +++++++++++++++++++
...alExplanation.java => AbstractExplanation.java} | 104 +++++++------------
.../traversal/util/ImmutableExplanation.java | 80 +++++++++++++++
.../traversal/util/TraversalExplanation.java | 112 ++++-----------------
.../structure/io/graphson/GraphSONModule.java | 7 ++
.../io/graphson/GraphSONSerializersV2d0.java | 28 ++++++
.../io/graphson/GraphSONSerializersV3d0.java | 28 ++++++
.../gremlin/structure/io/gryo/GryoVersion.java | 7 +-
.../tinkerpop/gremlin/util/function/Lambda.java | 31 ++++++
.../gremlin/process/traversal/BytecodeTest.java | 11 ++
.../EdgeLabelVerificationStrategyTest.java | 6 +-
...a => ReservedKeysVerificationStrategyTest.java} | 38 ++++---
.../traversal/util/TraversalExplanationTest.java | 8 ++
.../graphson/GraphSONMapperEmbeddedTypeTest.java | 11 ++
gremlin-dotnet/glv/Gremlin.Net.csproj.template | 11 +-
gremlin-dotnet/src/Gremlin.Net/Driver/Tokens.cs | 6 +-
gremlin-dotnet/src/Gremlin.Net/Gremlin.Net.csproj | 11 +-
.../src/Gremlin.Net/Process/Traversal/Lambda.cs | 4 +-
.../Verification/EdgeLabelVerificationStrategy.cs} | 34 ++-----
.../ReservedKeysVerificationStrategy.cs | 55 ++++++++++
.../Process/Traversal/StringBasedLambda.cs | 21 +++-
.../Driver/MessagesTests.cs | 2 +-
.../GraphTraversalSourceTests.cs | 14 +++
gremlin-driver/pom.xml | 18 ++++
.../apache/tinkerpop/gremlin/driver/Cluster.java | 17 ++--
.../org/apache/tinkerpop/gremlin/driver/Host.java | 3 +-
.../apache/tinkerpop/gremlin/driver/Tokens.java | 6 ++
.../gremlin/driver/message/ResponseStatusCode.java | 4 +-
.../apache/tinkerpop/gremlin/driver/HostTest.java | 46 ++++++++-
.../gremlin/groovy/engine/GremlinExecutor.java | 63 +++++++++---
.../groovy/jsr223/GroovyCompilerGremlinPlugin.java | 2 +-
.../gremlin/groovy/jsr223/GroovyTranslator.java | 31 +++++-
.../gremlin/groovy/engine/GremlinExecutorTest.java | 71 ++++++++++++-
.../groovy/jsr223/GroovyTranslatorTest.java | 28 +++++-
.../main/javascript/gremlin-javascript/README.md | 30 +++++-
.../main/javascript/gremlin-javascript/index.js | 2 +
.../gremlin-javascript/lib/driver/connection.js | 12 ++-
.../{auth/authenticator.js => response-error.js} | 37 ++++---
.../test/integration/remote-connection-tests.js | 5 +
gremlin-python/glv/GraphTraversalSource.template | 36 +++----
gremlin-python/glv/TraversalSource.template | 36 +++----
gremlin-python/src/main/jython/README | 17 +++-
.../src/main/jython/gremlin_python/__init__.py | 36 +++----
.../main/jython/gremlin_python/driver/__init__.py | 36 +++----
.../main/jython/gremlin_python/driver/client.py | 43 ++++----
.../jython/gremlin_python/driver/connection.py | 39 ++++---
.../driver/driver_remote_connection.py | 42 ++++----
.../main/jython/gremlin_python/driver/protocol.py | 39 +++----
.../gremlin_python/driver/remote_connection.py | 36 +++----
.../main/jython/gremlin_python/driver/request.py | 36 +++----
.../main/jython/gremlin_python/driver/resultset.py | 36 +++----
.../jython/gremlin_python/driver/serializer.py | 36 +++----
.../gremlin_python/driver/tornado/__init__.py | 36 +++----
.../gremlin_python/driver/tornado/transport.py | 41 ++++----
.../main/jython/gremlin_python/driver/transport.py | 38 +++----
.../main/jython/gremlin_python/process/__init__.py | 36 +++----
.../gremlin_python/process/anonymous_traversal.py | 36 +++----
.../gremlin_python/process/graph_traversal.py | 36 +++----
.../jython/gremlin_python/process/strategies.py | 53 ++++++----
.../jython/gremlin_python/process/traversal.py | 36 +++----
.../src/main/jython/gremlin_python/statics.py | 36 +++----
.../jython/gremlin_python/structure/__init__.py | 36 +++----
.../main/jython/gremlin_python/structure/graph.py | 36 +++----
.../jython/gremlin_python/structure/io/__init__.py | 36 +++----
.../gremlin_python/structure/io/graphsonV2d0.py | 44 ++++----
.../gremlin_python/structure/io/graphsonV3d0.py | 42 ++++----
.../src/main/jython/radish/feature_steps.py | 36 +++----
gremlin-python/src/main/jython/radish/terrain.py | 36 +++----
gremlin-python/src/main/jython/runtest.py | 36 +++----
gremlin-python/src/main/jython/setup.py | 4 +-
gremlin-python/src/main/jython/tests/__init__.py | 36 +++----
gremlin-python/src/main/jython/tests/conftest.py | 36 +++----
.../src/main/jython/tests/driver/__init__.py | 36 +++----
.../src/main/jython/tests/driver/test_client.py | 36 +++----
.../tests/driver/test_driver_remote_connection.py | 58 +++++++----
.../test_driver_remote_connection_threaded.py | 36 +++----
.../main/jython/tests/driver/test_serializer.py | 36 +++----
.../src/main/jython/tests/process/__init__.py | 36 +++----
.../src/main/jython/tests/process/test_dsl.py | 36 +++----
.../main/jython/tests/process/test_strategies.py | 36 +++----
.../main/jython/tests/process/test_traversal.py | 36 +++----
.../src/main/jython/tests/structure/__init__.py | 36 +++----
.../src/main/jython/tests/structure/io/__init__.py | 36 +++----
.../jython/tests/structure/io/test_graphsonV2d0.py | 36 +++----
.../jython/tests/structure/io/test_graphsonV3d0.py | 36 +++----
.../src/main/jython/tests/structure/test_graph.py | 36 +++----
.../src/main/jython/tests/test_statics.py | 36 +++----
gremlin-server/conf/gremlin-server-classic.yaml | 2 +-
gremlin-server/conf/gremlin-server-modern-py.yaml | 2 +-
.../conf/gremlin-server-modern-readonly.yaml | 2 +-
gremlin-server/conf/gremlin-server-modern.yaml | 2 +-
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
.../conf/gremlin-server-rest-modern.yaml | 2 +-
.../conf/gremlin-server-rest-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-spark.yaml | 2 +-
gremlin-server/conf/gremlin-server.yaml | 2 +-
.../apache/tinkerpop/gremlin/server/Settings.java | 21 +++-
.../gremlin/server/op/AbstractEvalOpProcessor.java | 12 ++-
.../gremlin/server/op/session/Session.java | 2 +-
.../server/op/traversal/TraversalOpProcessor.java | 22 ++--
.../gremlin/server/util/ServerGremlinExecutor.java | 4 +-
.../AbstractGremlinServerIntegrationTest.java | 8 +-
.../gremlin/server/GremlinDriverIntegrateTest.java | 6 +-
.../server/GremlinServerAuthKrb5IntegrateTest.java | 1 +
.../gremlin/server/GremlinServerIntegrateTest.java | 91 +++++++++++++++--
.../server/GremlinServerSessionIntegrateTest.java | 2 +-
.../gremlin/server/gremlin-server-integration.yaml | 2 +-
gremlin-shaded/pom.xml | 2 +-
hadoop-gremlin/pom.xml | 9 ++
neo4j-gremlin/pom.xml | 4 +-
spark-gremlin/pom.xml | 26 ++++-
.../traversal/step/sideEffect/TinkerGraphStep.java | 2 +-
.../tinkergraph/structure/TinkerGraphPlayTest.java | 37 ++++---
.../tinkergraph/structure/TinkerGraphTest.java | 31 +++++-
130 files changed, 2317 insertions(+), 1294 deletions(-)
create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/AbstractWarningVerificationStrategy.java
create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/ReservedKeysVerificationStrategy.java
copy gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/{TraversalExplanation.java => AbstractExplanation.java} (51%)
create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableExplanation.java
copy gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/{EdgeLabelVerificationStrategyTest.java => ReservedKeysVerificationStrategyTest.java} (77%)
copy gremlin-dotnet/src/Gremlin.Net/{Structure/Edge.cs => Process/Traversal/Strategy/Verification/EdgeLabelVerificationStrategy.cs} (53%)
create mode 100644 gremlin-dotnet/src/Gremlin.Net/Process/Traversal/Strategy/Verification/ReservedKeysVerificationStrategy.cs
copy gremlin-javascript/src/main/javascript/gremlin-javascript/lib/driver/{auth/authenticator.js => response-error.js} (58%)
[tinkerpop] 06/06: TINKERPOP-2076 Fixed Gremlin Server integration
tests after Java 11
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit c34a384addf036cbd487924df1aa846bf388df5e
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Mar 7 07:37:53 2019 -0500
TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11
---
.../tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java | 12 +++++-------
.../gremlin/server/GremlinServerHttpIntegrateTest.java | 2 +-
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 817b8a6..faee849 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -475,7 +475,7 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final ResponseException rex = (ResponseException) inner;
assertEquals("java.lang.ArithmeticException", rex.getRemoteExceptionHierarchy().get().get(0));
assertEquals(1, rex.getRemoteExceptionHierarchy().get().size());
- assertThat(rex.getRemoteStackTrace().get(), startsWith("java.lang.ArithmeticException: Division by zero\n\tat java.math.BigDecimal.divide(BigDecimal.java"));
+ assertThat(rex.getRemoteStackTrace().get(), startsWith("java.lang.ArithmeticException: Division by zero\n\tat java.base/java.math.BigDecimal.divide(BigDecimal.java"));
}
// should not die completely just because we had a bad serialization error. that kind of stuff happens
@@ -892,12 +892,11 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V2D0).create();
final Client client = cluster.connect();
- final Instant now = Instant.now();
- final List<Result> r = client.submit("java.time.Instant.ofEpochMilli(" + now.toEpochMilli() + ")").all().join();
+ final List<Result> r = client.submit("java.time.Instant.EPOCH").all().join();
assertEquals(1, r.size());
final Instant then = r.get(0).get(Instant.class);
- assertEquals(now, then);
+ assertEquals(Instant.EPOCH, then);
cluster.close();
}
@@ -926,12 +925,11 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
final Cluster cluster = TestClientFactory.build().serializer(Serializers.GRAPHSON_V3D0).create();
final Client client = cluster.connect();
- final Instant now = Instant.now();
- final List<Result> r = client.submit("java.time.Instant.ofEpochMilli(" + now.toEpochMilli() + ")").all().join();
+ final List<Result> r = client.submit("java.time.Instant.EPOCH").all().join();
assertEquals(1, r.size());
final Instant then = r.get(0).get(Instant.class);
- assertEquals(now, then);
+ assertEquals(Instant.EPOCH, then);
cluster.close();
}
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
index 1ec84c1..9f84164 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerHttpIntegrateTest.java
@@ -814,7 +814,7 @@ public class GremlinServerHttpIntegrateTest extends AbstractGremlinServerIntegra
final JsonNode node = mapper.readTree(json);
assertEquals("java.lang.ArithmeticException", node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).get(0).asText());
assertEquals(1, node.get(Tokens.STATUS_ATTRIBUTE_EXCEPTIONS).size());
- assertThat(node.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE).asText(), startsWith("java.lang.ArithmeticException: Division by zero\n\tat java.math.BigDecimal.divide(BigDecimal.java"));
+ assertThat(node.get(Tokens.STATUS_ATTRIBUTE_STACK_TRACE).asText(), startsWith("java.lang.ArithmeticException: Division by zero\n\tat java.base/java.math.BigDecimal.divide(BigDecimal.java"));
}
}
[tinkerpop] 02/06: TINKERPOP-2076 Backport
759d1a724eef3f76b48508ba8c49dcb992eff28f from Groovy 2.5.3 upgrade
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 38f01e86e31c4633aed328b13b0e3eed7ab6c993
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Mar 5 18:23:20 2019 -0500
TINKERPOP-2076 Backport 759d1a724eef3f76b48508ba8c49dcb992eff28f from Groovy 2.5.3 upgrade
---
.../apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 6 +++---
.../apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index 1a3ffc3..ed7b6e1 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -300,9 +300,9 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
// presented itself where the "Method code too large!" comes with other compilation errors so
// it seems that this message trumps other compilation errors to some reasonable degree that ends
// up being favorable for this problem
- if (t instanceof MultipleCompilationErrorsException && t.getMessage().contains("Method code too large!") &&
+ if (t instanceof MultipleCompilationErrorsException && t.getMessage().contains("Method too large") &&
((MultipleCompilationErrorsException) t).getErrorCollector().getErrorCount() == 1) {
- final String errorMessage = String.format("The Gremlin statement that was submitted exceed the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", trimMessage(msg));
+ final String errorMessage = String.format("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM, please split it into multiple smaller statements - %s", trimMessage(msg));
logger.warn(errorMessage);
ctx.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION)
.statusMessage(errorMessage)
@@ -322,7 +322,7 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
}
/**
- * Used to decrease the size of a Gremlin script that triggered a "method code too large" exception so that it
+ * Used to decrease the size of a Gremlin script that triggered a "method too large" exception so that it
* doesn't log a massive text string nor return a large error message.
*/
private RequestMessage trimMessage(final RequestMessage msg) {
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index 2887a6f..186f307 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -1499,7 +1499,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
client.submit(script, b).all().get();
fail("Should have tanked out because of number of parameters used and size of the compile script");
} catch (Exception ex) {
- assertThat(ex.getMessage(), containsString("The Gremlin statement that was submitted exceed the maximum compilation size allowed by the JVM"));
+ assertThat(ex.getMessage(), containsString("The Gremlin statement that was submitted exceeds the maximum compilation size allowed by the JVM"));
}
}
}
[tinkerpop] 04/06: TINKERPOP-2076 Made expectations around mock
more explicit
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit fd85f600a8ff9fa90146387ac727d5d882ed7ed7
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Mar 6 14:56:17 2019 -0500
TINKERPOP-2076 Made expectations around mock more explicit
The upgrade of mockito must have tightened some requirements around stubbing and the use of nulls. Setting expected arguments seemed to get the test working as it was before.
---
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
index 88d12ea..657cfb2 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.server.op;
import io.netty.channel.ChannelHandlerContext;
+import org.apache.tinkerpop.gremlin.driver.Tokens;
import org.apache.tinkerpop.gremlin.driver.message.RequestMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseMessage;
import org.apache.tinkerpop.gremlin.driver.message.ResponseStatusCode;
@@ -41,11 +42,13 @@ import static org.mockito.Matchers.anyString;
public class AbstractEvalOpProcessorTest {
- @org.junit.Ignore
@Test
public void evalOpInternalShouldHandleAllEvaluationExceptions() throws OpProcessorException {
final AbstractEvalOpProcessor processor = new StandardOpProcessor();
- final RequestMessage request = RequestMessage.build("test").create();
+ final RequestMessage request = RequestMessage.build("test")
+ .addArg(Tokens.ARGS_GREMLIN, "1+1")
+ .addArg(Tokens.ARGS_LANGUAGE, "gremlin-groovy")
+ .create();
final Settings settings = new Settings();
final ChannelHandlerContext ctx = Mockito.mock(ChannelHandlerContext.class);
final ArgumentCaptor<ResponseMessage> responseCaptor = ArgumentCaptor.forClass(ResponseMessage.class);
[tinkerpop] 05/06: TINKERPOP-2076 Fixed failing GraphComputer test
after Java 11 upgrade
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 90203e43bfdffce226355e8bd9c570b6e6f23fcb
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Mar 6 15:26:00 2019 -0500
TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade
Needed to explicitly count elements in ConcurrentSkipListSet as size() is not a constant-time operation. Wasn't failing at all on Java 8 but 11 made it fail every time.
---
.../process/computer/GraphComputerTest.java | 27 ++++++++++++++--------
1 file changed, 18 insertions(+), 9 deletions(-)
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index f092f50..2ba9199 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -1168,7 +1168,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
/////////////////////////////////////////////
/////////////////////////////////////////////
- @org.junit.Ignore
+
@Test
@LoadGraphWith(MODERN)
public void shouldStartAndEndWorkersForVertexProgramAndMapReduce() throws Exception {
@@ -1176,17 +1176,17 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
MapReduceI.WORKER_END.clear();
assertEquals(3, graphProvider.getGraphComputer(graph).program(new VertexProgramJ()).mapReduce(new MapReduceI()).submit().get().memory().<Integer>get("a").intValue());
if (MapReduceI.WORKER_START.size() == 2) {
- assertEquals(2, MapReduceI.WORKER_START.size());
+ assertEquals(2, MapReduceI.countTrue(MapReduceI.WORKER_START));
assertTrue(MapReduceI.WORKER_START.contains(MapReduce.Stage.MAP) && MapReduceI.WORKER_START.contains(MapReduce.Stage.REDUCE));
} else {
- assertEquals(3, MapReduceI.WORKER_START.size());
+ assertEquals(3, MapReduceI.countTrue(MapReduceI.WORKER_START));
assertTrue(MapReduceI.WORKER_START.contains(MapReduce.Stage.MAP) && MapReduceI.WORKER_START.contains(MapReduce.Stage.COMBINE) && MapReduceI.WORKER_START.contains(MapReduce.Stage.REDUCE));
}
if (MapReduceI.WORKER_END.size() == 2) {
- assertEquals(2, MapReduceI.WORKER_END.size());
+ assertEquals(2, MapReduceI.countTrue(MapReduceI.WORKER_END));
assertTrue(MapReduceI.WORKER_END.contains(MapReduce.Stage.MAP) && MapReduceI.WORKER_END.contains(MapReduce.Stage.REDUCE));
} else {
- assertEquals(3, MapReduceI.WORKER_END.size());
+ assertEquals(3, MapReduceI.countTrue(MapReduceI.WORKER_END));
assertTrue(MapReduceI.WORKER_END.contains(MapReduce.Stage.MAP) && MapReduceI.WORKER_END.contains(MapReduce.Stage.COMBINE) && MapReduceI.WORKER_END.contains(MapReduce.Stage.REDUCE));
}
}
@@ -1273,14 +1273,14 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public void map(final Vertex vertex, final MapEmitter<NullObject, Integer> emitter) {
emitter.emit(1);
- assertEquals(1, WORKER_START.size());
+ assertEquals(1, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP));
}
@Override
public void combine(final NullObject key, final Iterator<Integer> values, final ReduceEmitter<NullObject, Integer> emitter) {
emitter.emit(2);
- assertEquals(2, WORKER_START.size());
+ assertEquals(2, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP) && WORKER_START.contains(Stage.COMBINE));
assertFalse(WORKER_END.isEmpty());
}
@@ -1289,10 +1289,10 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
public void reduce(final NullObject key, final Iterator<Integer> values, final ReduceEmitter<NullObject, Integer> emitter) {
emitter.emit(3);
if (WORKER_START.size() == 2) {
- assertEquals(2, WORKER_START.size());
+ assertEquals(2, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP) && WORKER_START.contains(Stage.REDUCE));
} else {
- assertEquals(3, WORKER_START.size());
+ assertEquals(3, countTrue(WORKER_START));
assertTrue(WORKER_START.contains(Stage.MAP) && WORKER_START.contains(Stage.COMBINE) && WORKER_START.contains(Stage.REDUCE));
}
assertFalse(WORKER_END.isEmpty());
@@ -1316,6 +1316,15 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
public String getMemoryKey() {
return "a";
}
+
+ /**
+ * Javadoc for {@code ConcurrentSkipListSet} includes this little note: "Beware that, unlike in most
+ * collections, the size method is not a constant-time operation." Doing a traversal of elements will yield
+ * the correct count. Java 11 upgrade seemed to force this failure consistently.
+ */
+ static int countTrue(final Set<Stage> s) {
+ return Long.valueOf(IteratorUtils.count(s)).intValue();
+ }
}
/////////////////////////////////////////////
[tinkerpop] 01/06: TINKERPOP-2076 Initial effort to get TinkerPop
building on Java 11
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit ed15b991cdd9f970418e352ce591e75cc0c36600
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Tue Mar 5 15:39:06 2019 -0500
TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
---
CHANGELOG.asciidoc | 1 +
gremlin-console/pom.xml | 5 --
.../tinkerpop/gremlin/console/Console.groovy | 32 +++++-----
gremlin-console/src/main/static/NOTICE | 2 +-
gremlin-core/pom.xml | 34 +++++++++-
.../process/traversal/dsl/GremlinDslProcessor.java | 2 +-
.../traversal/step/map/OrderGlobalStep.java | 4 +-
gremlin-dotnet/pom.xml | 2 +-
gremlin-groovy/pom.xml | 7 +++
gremlin-javascript/pom.xml | 2 +-
gremlin-python/pom.xml | 2 +-
gremlin-server/src/main/static/NOTICE | 2 +-
.../server/op/AbstractEvalOpProcessorTest.java | 1 +
.../process/computer/GraphComputerTest.java | 1 +
gremlin-tools/gremlin-benchmark/README.asciidoc | 31 ++++++++++
gremlin-tools/gremlin-benchmark/pom.xml | 17 +++++
pom.xml | 72 +++++++---------------
17 files changed, 135 insertions(+), 82 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index f721bf4..20404d0 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -168,6 +168,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Bumped `httpclient` to 4.5.7.
* Bumped `slf4j` to 1.7.25.
* Bumped `commons-codec` to 1.12.
+* Bumped to Groovy 2.5.6.
* Fixed partial response failures when using authentication in `gremlin-python`.
* Fixed concurrency issues in `TraverserSet.toString()` and `ObjectWritable.toString()`.
* Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when folding merging conditions together.
diff --git a/gremlin-console/pom.xml b/gremlin-console/pom.xml
index d8c1806..85af288 100644
--- a/gremlin-console/pom.xml
+++ b/gremlin-console/pom.xml
@@ -46,11 +46,6 @@ limitations under the License.
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- <version>1.2</version>
- </dependency>
- <dependency>
<groupId>org.apache.tinkerpop</groupId>
<artifactId>gremlin-driver</artifactId>
<version>${project.version}</version>
diff --git a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
index aeec63a..4d0fce3 100644
--- a/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
+++ b/gremlin-console/src/main/groovy/org/apache/tinkerpop/gremlin/console/Console.groovy
@@ -18,10 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.console
+import groovy.cli.picocli.CliBuilder
+import groovy.cli.picocli.OptionAccessor
import jline.TerminalFactory
import jline.console.history.FileHistory
-import org.apache.commons.cli.Option
import org.apache.tinkerpop.gremlin.console.commands.BytecodeCommand
import org.apache.tinkerpop.gremlin.console.commands.GremlinSetCommand
import org.apache.tinkerpop.gremlin.console.commands.InstallCommand
@@ -45,8 +46,8 @@ import org.codehaus.groovy.tools.shell.Groovysh
import org.codehaus.groovy.tools.shell.IO
import org.codehaus.groovy.tools.shell.InteractiveShellRunner
import org.codehaus.groovy.tools.shell.commands.SetCommand
-import org.codehaus.groovy.tools.shell.util.HelpFormatter
import org.fusesource.jansi.Ansi
+import picocli.CommandLine
import sun.misc.Signal
import sun.misc.SignalHandler
@@ -445,21 +446,22 @@ class Console {
IO io = new IO(System.in, System.out, System.err)
- final CliBuilder cli = new CliBuilder(usage: 'gremlin.sh [options] [...]', formatter: new HelpFormatter(), stopAtNonOption: false)
+ final CliBuilder cli = new CliBuilder()
+ cli.stopAtNonOption = false
+ cli.name = "gremlin.sh"
// note that the inclusion of -l is really a setting handled by gremlin.sh and not by Console class itself.
// it is mainly listed here for informational purposes when the user starts things up with -h
- cli.with {
- h(longOpt: 'help', "Display this help message")
- v(longOpt: 'version', "Display the version")
- l("Set the logging level of components that use standard logging output independent of the Console")
- V(longOpt: 'verbose', "Enable verbose Console output")
- Q(longOpt: 'quiet', "Suppress superfluous Console output")
- D(longOpt: 'debug', "Enabled debug Console output")
- i(longOpt: 'interactive', argName: "SCRIPT ARG1 ARG2 ...", args: Option.UNLIMITED_VALUES, valueSeparator: ' ' as char, "Execute the specified script and leave the console open on completion")
- e(longOpt: 'execute', argName: "SCRIPT ARG1 ARG2 ...", args: Option.UNLIMITED_VALUES, valueSeparator: ' ' as char, "Execute the specified script (SCRIPT ARG1 ARG2 ...) and close the console on completion")
- C(longOpt: 'color', "Disable use of ANSI colors")
- }
+ cli.h(type: Boolean, longOpt: 'help', "Display this help message")
+ cli.v(type: Boolean,longOpt: 'version', "Display the version")
+ cli.l("Set the logging level of components that use standard logging output independent of the Console")
+ cli.V(type: Boolean, longOpt: 'verbose', "Enable verbose Console output")
+ cli.Q(type: Boolean, longOpt: 'quiet', "Suppress superfluous Console output")
+ cli.D(type: Boolean, longOpt: 'debug', "Enabled debug Console output")
+ cli.i(type: List, longOpt: 'interactive', arity: "1..*", argName: "SCRIPT ARG1 ARG2 ...", "Execute the specified script and leave the console open on completion")
+ cli.e(type: List, longOpt: 'execute', argName: "SCRIPT ARG1 ARG2 ...", "Execute the specified script (SCRIPT ARG1 ARG2 ...) and close the console on completion")
+ cli.C(type: Boolean, longOpt: 'color', "Disable use of ANSI colors")
+
OptionAccessor options = cli.parse(args)
if (options == null) {
@@ -517,7 +519,7 @@ class Console {
def parsedSet = []
for (ix; ix < normalizedArgs.length; ix++) {
// this is a do nothing as there's no arguments to the option or it's the start of a new option
- if (cli.options.options.any { "-" + it.opt == normalizedArgs[ix] || "--" + it.longOpt == normalizedArgs[ix] }) {
+ if (cli.savedTypeOptions.values().any { "-" + it.opt == normalizedArgs[ix] || "--" + it.longOpt == normalizedArgs[ix] }) {
// rollback the counter now that we hit the next option
ix--
break
diff --git a/gremlin-console/src/main/static/NOTICE b/gremlin-console/src/main/static/NOTICE
index 406985f..9bf743b 100644
--- a/gremlin-console/src/main/static/NOTICE
+++ b/gremlin-console/src/main/static/NOTICE
@@ -18,7 +18,7 @@ Original source copyright:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
------------------------------------------------------------------------
-Apache Groovy 2.4.16 (AL ASF)
+Apache Groovy 2.5.6 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
diff --git a/gremlin-core/pom.xml b/gremlin-core/pom.xml
index 55b6308..495e95e 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -111,7 +111,36 @@ limitations under the License.
<dependency>
<groupId>com.google.testing.compile</groupId>
<artifactId>compile-testing</artifactId>
- <version>0.10</version>
+ <version>0.15</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- resolve self-conflict within compile-testing -->
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>23.4-android</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.errorprone</groupId>
+ <artifactId>error_prone_annotations</artifactId>
+ <version>2.0.19</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -138,8 +167,7 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
<compilerArgs>
<arg>-parameters</arg>
<arg>-proc:none</arg>
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index 8397a5d..6a59b99 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -77,7 +77,7 @@ import java.util.stream.Stream;
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
@SupportedAnnotationTypes("org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl")
-@SupportedSourceVersion(SourceVersion.RELEASE_8)
+@SupportedSourceVersion(SourceVersion.RELEASE_11)
public class GremlinDslProcessor extends AbstractProcessor {
private Messager messager;
private Elements elementUtils;
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
index fa80e97..b33ab6d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
@@ -150,11 +150,11 @@ public final class OrderGlobalStep<S, C extends Comparable> extends CollectingBa
}
private final ProjectedTraverser<S, C> createProjectedTraverser(final Traverser.Admin<S> traverser) {
- final List<C> projections = new ArrayList<>(this.comparators.size());
+ final List<Object> projections = new ArrayList<>(this.comparators.size());
for (final Pair<Traversal.Admin<S, C>, Comparator<C>> pair : this.comparators) {
projections.add(TraversalUtil.apply(traverser, pair.getValue0()));
}
- return new ProjectedTraverser<>(traverser, projections);
+ return new ProjectedTraverser(traverser, projections);
}
private final MultiComparator<C> createMultiComparator() {
diff --git a/gremlin-dotnet/pom.xml b/gremlin-dotnet/pom.xml
index 1b327d2..85077c4 100644
--- a/gremlin-dotnet/pom.xml
+++ b/gremlin-dotnet/pom.xml
@@ -72,7 +72,7 @@ limitations under the License.
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
- <classifier>indy</classifier>
+ <type>pom</type>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index bdb0456..38145ea 100644
--- a/gremlin-groovy/pom.xml
+++ b/gremlin-groovy/pom.xml
@@ -157,6 +157,13 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
diff --git a/gremlin-javascript/pom.xml b/gremlin-javascript/pom.xml
index f830a92..a9f238e 100644
--- a/gremlin-javascript/pom.xml
+++ b/gremlin-javascript/pom.xml
@@ -58,7 +58,7 @@ limitations under the License.
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
- <classifier>indy</classifier>
+ <type>pom</type>
<scope>runtime</scope>
</dependency>
</dependencies>
diff --git a/gremlin-python/pom.xml b/gremlin-python/pom.xml
index b08a42d..af8ebf2 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -456,7 +456,7 @@ limitations under the License.
<groupId>org.codehaus.groovy</groupId>
<artifactId>groovy-all</artifactId>
<version>${groovy.version}</version>
- <classifier>indy</classifier>
+ <type>pom</type>
<scope>runtime</scope>
</dependency>
<dependency>
diff --git a/gremlin-server/src/main/static/NOTICE b/gremlin-server/src/main/static/NOTICE
index dafceba..b79bc00 100644
--- a/gremlin-server/src/main/static/NOTICE
+++ b/gremlin-server/src/main/static/NOTICE
@@ -5,7 +5,7 @@ This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
------------------------------------------------------------------------
-Apache Groovy 2.4.16 (AL ASF)
+Apache Groovy 2.5.6 (AL ASF)
------------------------------------------------------------------------
This product includes/uses ANTLR (http://www.antlr2.org/)
developed by Terence Parr 1989-2006
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
index 485a74d..88d12ea 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessorTest.java
@@ -41,6 +41,7 @@ import static org.mockito.Matchers.anyString;
public class AbstractEvalOpProcessorTest {
+ @org.junit.Ignore
@Test
public void evalOpInternalShouldHandleAllEvaluationExceptions() throws OpProcessorException {
final AbstractEvalOpProcessor processor = new StandardOpProcessor();
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 2b018db..f092f50 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -1168,6 +1168,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
/////////////////////////////////////////////
/////////////////////////////////////////////
+ @org.junit.Ignore
@Test
@LoadGraphWith(MODERN)
public void shouldStartAndEndWorkersForVertexProgramAndMapReduce() throws Exception {
diff --git a/gremlin-tools/gremlin-benchmark/README.asciidoc b/gremlin-tools/gremlin-benchmark/README.asciidoc
new file mode 100644
index 0000000..84f8d5f
--- /dev/null
+++ b/gremlin-tools/gremlin-benchmark/README.asciidoc
@@ -0,0 +1,31 @@
+////
+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.
+////
+== Apache TinkerPop Benchmarks
+
+This module is for development and testing only and no convenience binaries are produced for it. The compilation
+of this module requires:
+
+[source,xml]
+----
+<dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>provided</scope>
+</dependency>
+----
+
+The source for this project can be found at link:javaee/javax.annotation:https://github.com/javaee/javax.annotation.
\ No newline at end of file
diff --git a/gremlin-tools/gremlin-benchmark/pom.xml b/gremlin-tools/gremlin-benchmark/pom.xml
index 583a373..6be69c4 100644
--- a/gremlin-tools/gremlin-benchmark/pom.xml
+++ b/gremlin-tools/gremlin-benchmark/pom.xml
@@ -55,10 +55,27 @@ limitations under the License.
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.tinkerpop</groupId>
+ <artifactId>tinkergraph-gremlin</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
</dependency>
+ <!--
+ becomes org.eclipse.ee4j after this version which is eclipse/gpl dual licensed, compared to this version
+ which is cddl/gpl dual licensed. the source for this project can be found here:
+
+ https://github.com/javaee/javax.annotation
+ -->
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>1.3.2</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
diff --git a/pom.xml b/pom.xml
index ffb0f04..420ed4c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,10 +140,10 @@ limitations under the License.
<commons.configuration.version>1.10</commons.configuration.version>
<commons.lang.version>2.6</commons.lang.version>
<commons.lang3.version>3.8.1</commons.lang3.version>
- <groovy.version>2.4.17</groovy.version>
+ <groovy.version>2.5.6</groovy.version>
<hadoop.version>2.7.2</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
- <javadoc-plugin.version>2.10.4</javadoc-plugin.version>
+ <javadoc-plugin.version>3.1.0</javadoc-plugin.version>
<jcabi.version>1.1</jcabi.version>
<log4j.version>1.2.17</log4j.version>
<metrics.version>3.0.2</metrics.version>
@@ -179,8 +179,9 @@ limitations under the License.
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4.1</version>
+ <version>3.0.0-M2</version>
<executions>
<execution>
<id>enforce-all</id>
@@ -229,7 +230,7 @@ limitations under the License.
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
<tags>
<tag>
<name>example</name>
@@ -246,7 +247,7 @@ limitations under the License.
</goals>
<phase>site</phase>
<configuration>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
<includeDependencySources>true</includeDependencySources>
<dependencySourceIncludes>
<dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
@@ -433,10 +434,9 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.7.0</version>
+ <version>3.8.0</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
+ <release>11</release>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
@@ -450,9 +450,10 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.21.0</version>
+ <version>2.22.0</version>
<configuration>
- <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true
+ <argLine>
+ -Dlog4j.configuration=${log4j-test.properties} -Dbuild.dir=${project.build.directory} -Dis.testing=true
</argLine>
<excludes>
<exclude>**/*IntegrateTest.java</exclude>
@@ -474,8 +475,8 @@ limitations under the License.
<include>**/*IntegrateTest.java</include>
</includes>
<skipTests>${skipIntegrationTests}</skipTests>
- <argLine>-Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182
- -Dbuild.dir=${project.build.directory} -Dis.testing=true
+ <argLine>
+ -Dlog4j.configuration=${log4j-test.properties} -Dhost=localhost -Dport=8182 -Dbuild.dir=${project.build.directory} -Dis.testing=true
</argLine>
<summaryFile>target/failsafe-reports/failsafe-integration.xml</summaryFile>
</configuration>
@@ -518,7 +519,7 @@ limitations under the License.
<artifactId>gmavenplus-plugin</artifactId>
<version>1.7.1</version>
<configuration>
- <targetBytecode>1.8</targetBytecode>
+ <targetBytecode>11</targetBytecode>
<invokeDynamic>true</invokeDynamic>
</configuration>
</plugin>
@@ -584,41 +585,6 @@ limitations under the License.
<version>${commons.lang3.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>1.2.1</version>
- <exclusions>
- <!-- self-conflicts -->
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <!-- conflict with commons-configuration -->
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- <!-- conflicts with giraph-core (which appears to have more consistent dependencies) -->
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-core-asl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- </exclusion>
- <!-- conflict with TinkerPop tests -->
- <exclusion>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<version>${metrics.version}</version>
@@ -704,7 +670,7 @@ limitations under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
+ <version>2.24.5</version>
<exclusions>
<exclusion>
<groupId>org.hamcrest</groupId>
@@ -1196,12 +1162,16 @@ limitations under the License.
<inherited>false</inherited>
<configuration>
<destDir>full</destDir>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
<overview>${basedir}/docs/javadoc/overview.html</overview>
<quiet>true</quiet>
<sourcepath>
giraph-gremlin/src/main/java:gremlin-core/src/main/java:gremlin-driver/src/main/java:gremlin-groovy/src/main/java:gremlin-python/src/main/java:gremlin-server/src/main/java:gremlin-test/src/main/java:hadoop-gremlin/src/main/java:neo4j-gremlin/src/main/java:spark-gremlin/src/main/java:tinkergraph-gremlin/src/main/java
</sourcepath>
+ <includeDependencySources>true</includeDependencySources>
+ <dependencySourceIncludes>
+ <dependencySourceInclude>org.apache.tinkerpop:*</dependencySourceInclude>
+ </dependencySourceIncludes>
</configuration>
</execution>
<execution>
@@ -1213,7 +1183,7 @@ limitations under the License.
<inherited>false</inherited>
<configuration>
<destDir>core</destDir>
- <additionalparam>-Xdoclint:none</additionalparam>
+ <additionalJOption>-Xdoclint:none</additionalJOption>
<overview>${basedir}/docs/javadoc/overview.html</overview>
<quiet>true</quiet>
<sourcepath>
[tinkerpop] 03/06: TINKERPOP-2076 Bumped Hadoop to 2.7.7
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2076
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit b918c34bccf283a5348793f20fc376f45b81b61d
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Wed Mar 6 11:25:01 2019 -0500
TINKERPOP-2076 Bumped Hadoop to 2.7.7
---
CHANGELOG.asciidoc | 1 +
pom.xml | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 20404d0..23e39c4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -169,6 +169,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Bumped `slf4j` to 1.7.25.
* Bumped `commons-codec` to 1.12.
* Bumped to Groovy 2.5.6.
+* Bumped to Hadoop 2.7.7.
* Fixed partial response failures when using authentication in `gremlin-python`.
* Fixed concurrency issues in `TraverserSet.toString()` and `ObjectWritable.toString()`.
* Fixed a bug in `InlineFilterStrategy` that mixed up and's and or's when folding merging conditions together.
diff --git a/pom.xml b/pom.xml
index 420ed4c..1a686b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@ limitations under the License.
<commons.lang.version>2.6</commons.lang.version>
<commons.lang3.version>3.8.1</commons.lang3.version>
<groovy.version>2.5.6</groovy.version>
- <hadoop.version>2.7.2</hadoop.version>
+ <hadoop.version>2.7.7</hadoop.version>
<java.tuples.version>1.2</java.tuples.version>
<javadoc-plugin.version>3.1.0</javadoc-plugin.version>
<jcabi.version>1.1</jcabi.version>