Bump to TinkerPop 3.0.1-incubating.

Added GraphProvider.Descriptor (as required for computer test GraphProviders). Still seeing some failing tests on the groovy side so this branch isn't building yet.
biyuhao · Sep 2, 2015 · 79c9f9b · 79c9f9b
1 parent 8a77f02
commit 79c9f9b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -59,7 +59,7 @@
     </scm>
     <properties>
         <titan.compatible.versions />
-        <tinkerpop.version>3.0.0-incubating</tinkerpop.version>
+        <tinkerpop.version>3.0.1-incubating</tinkerpop.version>
         <junit.version>4.12</junit.version>
         <mrunit.version>1.1.0</mrunit.version>
         <cassandra.version>2.1.9</cassandra.version>

diff --git a/...leyje/src/test/java/com/thinkaurelius/titan/blueprints/BerkeleyGraphComputerProvider.java b/...leyje/src/test/java/com/thinkaurelius/titan/blueprints/BerkeleyGraphComputerProvider.java
@@ -5,13 +5,16 @@
 import com.thinkaurelius.titan.diskstorage.berkeleyje.BerkeleyJETx;
 import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration;
 import com.thinkaurelius.titan.graphdb.configuration.GraphDatabaseConfiguration;
+import com.thinkaurelius.titan.graphdb.olap.computer.FulgoraGraphComputer;
+import org.apache.tinkerpop.gremlin.GraphProvider;
 
 import java.time.Duration;
 import java.util.Set;
 
 /**
  * @author Matthias Broecheler ([email protected])
  */
+@GraphProvider.Descriptor(computer = FulgoraGraphComputer.class)
 public class BerkeleyGraphComputerProvider extends AbstractTitanGraphComputerProvider {
 
     @Override

diff --git a/.../src/test/java/com/thinkaurelius/titan/blueprints/thrift/ThriftGraphComputerProvider.java b/.../src/test/java/com/thinkaurelius/titan/blueprints/thrift/ThriftGraphComputerProvider.java
@@ -4,10 +4,13 @@
 import com.thinkaurelius.titan.blueprints.AbstractTitanGraphComputerProvider;
 import com.thinkaurelius.titan.blueprints.AbstractTitanGraphProvider;
 import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration;
+import com.thinkaurelius.titan.graphdb.olap.computer.FulgoraGraphComputer;
+import org.apache.tinkerpop.gremlin.GraphProvider;
 
 /**
  * @author Matthias Broecheler ([email protected])
  */
+@GraphProvider.Descriptor(computer = FulgoraGraphComputer.class)
 public class ThriftGraphComputerProvider extends AbstractTitanGraphComputerProvider {
 
     @Override

diff --git a/...ase-core/src/test/java/com/thinkaurelius/titan/blueprints/HBaseGraphComputerProvider.java b/...ase-core/src/test/java/com/thinkaurelius/titan/blueprints/HBaseGraphComputerProvider.java
@@ -2,14 +2,17 @@
 
 import com.thinkaurelius.titan.HBaseStorageSetup;
 import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration;
+import com.thinkaurelius.titan.graphdb.olap.computer.FulgoraGraphComputer;
 import org.apache.commons.configuration.Configuration;
+import org.apache.tinkerpop.gremlin.GraphProvider;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 
 import java.io.IOException;
 
 /**
  * @author Matthias Broecheler ([email protected])
  */
+@GraphProvider.Descriptor(computer = FulgoraGraphComputer.class)
 public class HBaseGraphComputerProvider extends AbstractTitanGraphComputerProvider {
 
     @Override

diff --git a/...-test/src/test/java/com/thinkaurelius/titan/blueprints/InMemoryGraphComputerProvider.java b/...-test/src/test/java/com/thinkaurelius/titan/blueprints/InMemoryGraphComputerProvider.java
@@ -3,10 +3,13 @@
 import com.thinkaurelius.titan.StorageSetup;
 import com.thinkaurelius.titan.diskstorage.configuration.ModifiableConfiguration;
 import com.thinkaurelius.titan.graphdb.configuration.GraphDatabaseConfiguration;
+import com.thinkaurelius.titan.graphdb.olap.computer.FulgoraGraphComputer;
+import org.apache.tinkerpop.gremlin.GraphProvider;
 
 /**
  * Created by bryn on 06/05/15.
  */
+@GraphProvider.Descriptor(computer = FulgoraGraphComputer.class)
 public class InMemoryGraphComputerProvider extends AbstractTitanGraphComputerProvider {
 
     @Override