diff --git a/docs/changelog.md b/docs/changelog.md index ba1aa201a8..e2244dc424 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -63,7 +63,7 @@ compile "org.janusgraph:janusgraph-core:0.6.4" * Elasticsearch 6.0.1, 6.6.0, 7.14.0 * Apache Lucene 8.9.0 * Apache Solr 7.7.2, 8.11.0 -* Apache TinkerPop 3.5.5 +* Apache TinkerPop 3.5.7 * Java 1.8 #### Changes diff --git a/janusgraph-backend-testutils/src/main/java/org/janusgraph/olap/OLAPTest.java b/janusgraph-backend-testutils/src/main/java/org/janusgraph/olap/OLAPTest.java index 8ec9565ffd..11a42b34fc 100644 --- a/janusgraph-backend-testutils/src/main/java/org/janusgraph/olap/OLAPTest.java +++ b/janusgraph-backend-testutils/src/main/java/org/janusgraph/olap/OLAPTest.java @@ -617,6 +617,7 @@ public void testPageRank() throws ExecutionException, InterruptedException { final JanusGraphComputer computer = graph.compute(); computer.resultMode(JanusGraphComputer.ResultMode.NONE); computer.workers(4); + computer.vertexProperties(__.properties("dummy")); computer.program(PageRankVertexProgram.build().iterations(10).vertexCount(numV).dampingFactor(alpha).create(graph)); computer.mapReduce(PageRankMapReduce.build().create()); ComputerResult result = computer.submit().get(); diff --git a/janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/computer/FulgoraGraphComputer.java b/janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/computer/FulgoraGraphComputer.java index 5978983940..e0c1933244 100644 --- a/janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/computer/FulgoraGraphComputer.java +++ b/janusgraph-core/src/main/java/org/janusgraph/graphdb/olap/computer/FulgoraGraphComputer.java @@ -36,6 +36,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet; import org.apache.tinkerpop.gremlin.structure.Edge; import org.apache.tinkerpop.gremlin.structure.Graph; +import org.apache.tinkerpop.gremlin.structure.Property; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; import org.apache.tinkerpop.gremlin.structure.util.StringFactory; @@ -115,6 +116,12 @@ public GraphComputer edges(final Traversal edgeFilter) { return this; } + @Override + public GraphComputer vertexProperties(final Traversal> vertexPropertyFilter) { + this.graphFilter.setVertexPropertyFilter(vertexPropertyFilter); + return this; + } + @Override public GraphComputer result(ResultGraph resultGraph) { Preconditions.checkNotNull(resultGraph, "Need to specify mode"); diff --git a/janusgraph-server/pom.xml b/janusgraph-server/pom.xml index d6cac7c580..90ab23c979 100644 --- a/janusgraph-server/pom.xml +++ b/janusgraph-server/pom.xml @@ -83,6 +83,17 @@ + + com.jcabi + jcabi-manifests + ${jcabi.version} + + + org.slf4j + slf4j-api + + + diff --git a/pom.xml b/pom.xml index 0b40206063..19298ad7a0 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 1.0.0,1.1.0-SNAPSHOT - 3.5.5 + 3.5.7 1.10.0 5.10.0 4.11.0 @@ -116,6 +116,7 @@ 1.57.2 3.15.3 2.10.1 + 1.2.1 1.21 22.3.2 @@ -712,7 +713,7 @@ org.yaml snakeyaml - 1.32 + 2.0 net.oneandone.reflections8