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/05/06 13:42:06 UTC
[tinkerpop] branch TINKERPOP-2076 updated (b2900f5 -> 5d37641)
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 b2900f5 TINKERPOP-2076 Fixed Gremlin Server integration tests after Java 11
discard c00d311 TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade
discard e1f07b3 TINKERPOP-2076 Made expectations around mock more explicit
discard 2089091 TINKERPOP-2076 Bumped Hadoop to 2.7.7
discard 0a82d61 TINKERPOP-2076 Backport 759d1a724eef3f76b48508ba8c49dcb992eff28f from Groovy 2.5.3 upgrade
discard b56e555 TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
add 9334272 TINKERPOP-2180: Make sure user.working_dir is still respected properly
add 62158d2 TINKERPOP-2180: Fix -l DEBUG
add 06cc959 TINKERPOP-2179: Have SerializationException extend IOException
add b59d779 Merge pull request #1083 from newkek/TINKERPOP-2179
add 0769976 Implemented EdgeLabelVerificationStrategy
add bc2c3f5 Merge pull request #1087 from apache/TINKERPOP-2191
add db335da TINKERPOP-2181 Allow ctrl+c to break a command in Gremlin Console
add ccdc7c2 Merge branch 'TINKERPOP-2181' into tp33
add 03234d2 TINKERPOP-2194 Simplify choose() test to avoid enforcing map key order CTR
add 98f67b1 TINKERPOP-2182 Removed gperfutils dependencies in Console
add 2446825 Fix threaded transaction tests. The graph thread should be refreshed to observe the result of committed transaction.
add 132ed82 TINKERPOP-2112 Fold property() so that T values can work in any order
add 82254f1 Added a test around calling steps with varargs that use arrays CTR
add 5e60558 TINKERPOP-2183 Interpreter mode not handling class definitions
add 98c40aa Limited logging for a host marked unavailable
add 3fdc254 Hardened fold() glv test CTR
add aa10c22 Switch docker build to openjdk
add cad1b4b Allow to configure processor in Gremlin-JavaScript
add 0e391a8 Add the CHANGELOG entry
add 2183ced Merge branch 'pr-1098' into tp33
add 47ba61f Minor update to changelog CTR
add 36b8c36 TINKERPOP-2196 Fixed PartitionStrategy when setting vertex label
add 87123f2 Merge branch 'TINKERPOP-2196' into tp33
add cbac4f04 TINKERPOP-2200 Detach evented edge by way of the EventStrategy rather than DetachedFactory CTR
add 30b2535 TINKERPOP-2208 Added inject() to steps geneerated by the DSL TraversalSource CTR
add 6a25284 TINKERPOP-2204 Prevent client-side hangs if server metadata generation fails CTR
add 734b7b2 Create uber jar for gremlin-console
add 5799ca5 Merge branch 'pr-1103' into uberjar
add 6caeb93 Generated an uberjar artifact for Gremlin Console
new 49be647 TINKERPOP-2076 Initial effort to get TinkerPop building on Java 11
new b16e152 TINKERPOP-2076 Backport 759d1a724eef3f76b48508ba8c49dcb992eff28f from Groovy 2.5.3 upgrade
new eb641ac TINKERPOP-2076 Bumped Hadoop to 2.7.7
new 47bc92c TINKERPOP-2076 Made expectations around mock more explicit
new baa5733 TINKERPOP-2076 Fixed failing GraphComputer test after Java 11 upgrade
new 5d37641 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 (b2900f5)
\
N -- N -- N refs/heads/TINKERPOP-2076 (5d37641)
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 | 16 +-
docker/Dockerfile | 29 ++--
docs/src/dev/developer/for-committers.asciidoc | 9 +-
docs/src/reference/gremlin-applications.asciidoc | 59 ++++---
docs/src/upgrade/release-3.3.x.asciidoc | 86 ++++++++++
gremlin-console/conf/log4j-console.properties | 1 +
gremlin-console/pom.xml | 93 ++++++++--
gremlin-console/src/main/bin/gremlin.sh | 13 +-
.../tinkerpop/gremlin/console/Console.groovy | 67 ++++++--
.../gremlin/console/GremlinGroovysh.groovy | 84 ++++-----
.../tinkerpop/gremlin/console/Mediator.groovy | 7 +
.../console/jsr223/UtilitiesGremlinPlugin.java | 46 +----
.../src/test/python/tests/test_console.py | 5 +
.../tinkerpop/gremlin/jsr223/CoreImports.java | 2 +
.../process/traversal/dsl/GremlinDslProcessor.java | 14 ++
.../traversal/dsl/graph/GraphTraversal.java | 42 ++++-
.../traversal/step/map/AddEdgeStartStep.java | 4 +-
.../strategy/decoration/PartitionStrategy.java | 32 ++--
.../EdgeLabelVerificationStrategy.java | 131 ++++++++++++++
.../structure/io/graphson/GraphSONModule.java | 5 +
.../gremlin/structure/io/gryo/GryoVersion.java | 7 +-
.../gremlin/process/traversal/BytecodeTest.java | 20 ++-
.../EdgeLabelVerificationStrategyTest.java | 188 +++++++++++++++++++++
.../org/apache/tinkerpop/gremlin/driver/Host.java | 6 +-
.../gremlin/driver/ser/SerializationException.java | 8 +-
.../gremlin/driver/SerializationExceptionTest.java | 31 ++--
.../ast/InterpreterModeASTTransformation.groovy | 9 +-
.../jsr223/GremlinGroovyScriptEngineTest.java | 2 +
.../gremlin-javascript/lib/driver/client.js | 3 +-
.../gremlin-javascript/test/unit/client-test.js | 58 +++++++
.../server/op/traversal/TraversalOpProcessor.java | 3 +-
gremlin-test/features/branch/Choose.feature | 6 +-
gremlin-test/features/map/Fold.feature | 9 +-
.../process/traversal/step/branch/ChooseTest.java | 15 +-
.../decoration/PartitionStrategyProcessTest.java | 10 ++
.../gremlin/structure/TransactionTest.java | 2 +
.../neo4j/structure/trait/MultiMetaNeo4jTrait.java | 3 +-
.../tinkergraph/structure/TinkerGraphTest.java | 19 +++
38 files changed, 921 insertions(+), 223 deletions(-)
create mode 100644 gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategy.java
create mode 100644 gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/EdgeLabelVerificationStrategyTest.java
copy gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/structure/DirectionTest.java => gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SerializationExceptionTest.java (59%)
create mode 100644 gremlin-javascript/src/main/javascript/gremlin-javascript/test/unit/client-test.js
[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 5d37641e1860e75aa747404642901d9cb747c04c
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 addc608..b726ac4 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] 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 baa57334bece5a20b2044af639baa433c934a4e4
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 6509b72..4874848 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
@@ -1167,7 +1167,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
/////////////////////////////////////////////
/////////////////////////////////////////////
- @org.junit.Ignore
+
@Test
@LoadGraphWith(MODERN)
public void shouldStartAndEndWorkersForVertexProgramAndMapReduce() throws Exception {
@@ -1175,17 +1175,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));
}
}
@@ -1272,14 +1272,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());
}
@@ -1288,10 +1288,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());
@@ -1315,6 +1315,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] 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 47bc92cadcc8f3ec7696b7d900a4e1f11ddc553d
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 f87306d..dea5272 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;
@@ -39,11 +40,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] 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 eb641ac46a20846b6d4978d090a0c20f07e091de
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 4f13c21..2c19022 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -60,6 +60,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 fdba6af..f8cfab4 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>
[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 49be6479e87a4c690211235370381eff8f3f5c94
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 +-
.../tinkerpop/gremlin/driver/Connection.java | 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 +++++++---------------
18 files changed, 137 insertions(+), 82 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index da2d017..4f13c21 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -59,6 +59,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 2c7e49d..5520ebe 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 fb9c9a4..6282508 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
@@ -443,21 +444,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) {
@@ -515,7 +517,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 dab1337..55e1d2c 100644
--- a/gremlin-core/pom.xml
+++ b/gremlin-core/pom.xml
@@ -114,7 +114,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>
@@ -141,8 +170,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 beb1ca0..708a7b8 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-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
index bc91b3c..192b93d 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java
@@ -26,6 +26,8 @@ import io.netty.channel.ChannelPromise;
import io.netty.channel.socket.nio.NioSocketChannel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
import java.net.URI;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
diff --git a/gremlin-groovy/pom.xml b/gremlin-groovy/pom.xml
index 2e0e107..95ab622 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 77e0374..1e9535b 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 bd8cd90..55dd551 100644
--- a/gremlin-python/pom.xml
+++ b/gremlin-python/pom.xml
@@ -463,7 +463,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 72b9c5c..f87306d 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
@@ -39,6 +39,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 6ece947..6509b72 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
@@ -1167,6 +1167,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 e7416e6..fb7fcba 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 1a1bf26..fdba6af 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.16</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>
@@ -182,8 +182,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>
@@ -232,7 +233,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>
@@ -249,7 +250,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>
@@ -487,10 +488,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>
@@ -504,9 +504,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>
@@ -528,8 +529,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>
@@ -572,7 +573,7 @@ limitations under the License.
<artifactId>gmavenplus-plugin</artifactId>
<version>1.6.3</version>
<configuration>
- <targetBytecode>1.8</targetBytecode>
+ <targetBytecode>11</targetBytecode>
<invokeDynamic>true</invokeDynamic>
</configuration>
</plugin>
@@ -636,41 +637,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>
@@ -756,7 +722,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>
@@ -1248,12 +1214,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>
@@ -1265,7 +1235,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] 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 b16e15209e635c3d25608d6c907ba99220530808
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 73c080c..b5a68ae 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
@@ -310,9 +310,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);
rhc.writeAndFlush(ResponseMessage.build(msg).code(ResponseStatusCode.SERVER_ERROR_SCRIPT_EVALUATION)
.statusMessage(errorMessage)
@@ -331,7 +331,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 86cf62d..a3cb66b 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
@@ -1424,7 +1424,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"));
}
}
}