Bump TinkerPop to 3.6.4 [cql-tests] [tp-tests]

Fixes JanusGraph#3766 Signed-off-by: Oleksandr Porunov <alexandr.porunov@gmail.com>
porunov · Jun 1, 2023 · a878393 · a878393 · github-actions · Jun 1, 2023
1 parent 9d7cbcd
commit a878393
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -72,7 +72,7 @@ compile "org.janusgraph:janusgraph-core:1.0.0"
 * Elasticsearch 6.0.1, 6.6.0, 7.17.8, 8.6.0
 * Apache Lucene 8.11.1
 * Apache Solr 8.11.1
-* Apache TinkerPop 3.6.2
+* Apache TinkerPop 3.6.4
 * Java 8, 11
 
 !!! note

diff --git a/janusgraph-core/src/main/java/org/janusgraph/core/JanusGraph.java b/janusgraph-core/src/main/java/org/janusgraph/core/JanusGraph.java
@@ -86,6 +86,11 @@
         test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.MergeVertexTest",
         method = "g_withSideEffectXc_label_person_name_markoX_withSideEffectXm_age_19X_mergeVXselectXcXX_optionXonMatch_selectXmXX_option",
         reason = "JanusGraph doesn't support MergeVertex yet.")
+@Graph.OptOut(
+        test = "org.apache.tinkerpop.gremlin.process.traversal.step.map.CountTest",
+        method = "g_VX1X_valuesXageX_countXlocalX",
+        reason = "TinkerPop 3.6.4 buggy test. We should remove this OptOut when updating to TinkerPop >= 3.6.5 because the test was fixed in TinkerPop 3.6.5. " +
+            "See comment here: https://github.com/JanusGraph/janusgraph/pull/3780#issuecomment-1571961290")
 public interface JanusGraph extends Transaction {
 
     /**

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -172,6 +172,6 @@ nav:
 extra:
   latest_version: 1.0.0-rc2
   snapshot_version: 1.0.0-SNAPSHOT
-  tinkerpop_version: 3.6.2
+  tinkerpop_version: 3.6.4
   hadoop_version: 3.3.4
   jamm_version: 0.3.3
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.6.2</tinkerpop.version>
+        <tinkerpop.version>3.6.4</tinkerpop.version>
         <junit-platform.version>1.9.2</junit-platform.version>
         <junit.version>5.9.2</junit.version>
         <mockito.version>4.11.0</mockito.version>
@@ -747,7 +747,7 @@
             <dependency>
                 <groupId>org.yaml</groupId>
                 <artifactId>snakeyaml</artifactId>
-                <version>1.32</version>
+                <version>2.0</version>
             </dependency>
             <dependency>
                 <groupId>net.oneandone.reflections8</groupId>
Benchmark suite	Current: `a878393`	Previous: `087a1b5`	Ratio
`org.janusgraph.JanusGraphSpeedBenchmark.basicAddAndDelete`	`17932.38313619761` ms/op	`14041.573809394502` ms/op	`1.28`
`org.janusgraph.GraphCentricQueryBenchmark.getVertices`	`1634.714178161062` ms/op	`1369.0215005040418` ms/op	`1.19`
`org.janusgraph.MgmtOlapJobBenchmark.runClearIndex`	`223.0680432` ms/op	`218.65942406268113` ms/op	`1.02`
`org.janusgraph.MgmtOlapJobBenchmark.runReindex`	`528.9912288950001` ms/op	`461.34877108030304` ms/op	`1.15`
`org.janusgraph.JanusGraphSpeedBenchmark.basicCount`	`492.6509701335154` ms/op	`393.48041849314` ms/op	`1.25`
`org.janusgraph.CQLMultiQueryBenchmark.getNeighborNames`	`18671.33692976393` ms/op	`15153.144193346492` ms/op	`1.23`
`org.janusgraph.CQLMultiQueryBenchmark.getNames`	`18515.009970733336` ms/op	`15130.64044742827` ms/op	`1.22`