Upgrade TinkerPop version to 3.5.7 [cql-tests][tp-tests]

Signed-off-by: Boxuan Li <[email protected]>
JanusGraph · Oct 2, 2023 · 59ceef3 · 59ceef3
1 parent d9cb889
commit 59ceef3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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<Vertex, Edge> edgeFilter) {
         return this;
     }
 
+    @Override
+    public GraphComputer vertexProperties(final Traversal<Vertex, ? extends Property<?>> 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
@@ -83,6 +83,17 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.jcabi</groupId>
+            <artifactId>jcabi-manifests</artifactId>
+            <version>${jcabi.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.slf4j</groupId>
+                    <artifactId>slf4j-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/pom.xml b/pom.xml
@@ -56,7 +56,7 @@
     </distributionManagement>
     <properties>
         <titan.compatible-versions>1.0.0,1.1.0-SNAPSHOT</titan.compatible-versions>
-        <tinkerpop.version>3.5.5</tinkerpop.version>
+        <tinkerpop.version>3.5.7</tinkerpop.version>
         <junit-platform.version>1.10.0</junit-platform.version>
         <junit.version>5.10.0</junit.version>
         <mockito.version>4.11.0</mockito.version>
@@ -116,6 +116,7 @@
         <grpc.version>1.57.2</grpc.version>
         <protoc.version>3.15.3</protoc.version>
         <gson.version>2.10.1</gson.version>
+        <jcabi.version>1.2.1</jcabi.version>
         <jmh.version>1.21</jmh.version>
         <graalvm-nativeimage.version>22.3.2</graalvm-nativeimage.version>
     </properties>
@@ -712,7 +713,7 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>1.32</version>
+                <version>2.0</version>
             </dependency>
             <dependency>
                 <groupId>net.oneandone.reflections8</groupId>