Remove titan and blueprints
Change-Id: I8d465c1a7d50a7a7e6bb72141b50ad605e47097e
diff --git a/pom.xml b/pom.xml
index dea1fc6..41efcb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,6 @@
<instrumentation>
<ignores>
<ignore>org.slf4j.*</ignore>
- <ignore>com.tinkerpop.*</ignore>
</ignores>
<excludes>
<exclude>org/openflow/**/*.class</exclude>
@@ -297,7 +296,6 @@
-->
<excludes>
<exclude>**/RCProtos.java</exclude>
- <exclude>**/com/tinkerpop/**</exclude>
<exclude>**/edu/stanford/**</exclude>
<exclude>**/net/floodlightcontroller/**</exclude>
<exclude>**/org/openflow/**</exclude>
@@ -462,7 +460,6 @@
-->
<excludes>
<exclude>**/RCProtos.java</exclude>
- <exclude>**/com/tinkerpop/**</exclude>
<exclude>**/edu/stanford/**</exclude>
<exclude>**/net/floodlightcontroller/**</exclude>
<exclude>**/org/openflow/**</exclude>
@@ -492,36 +489,6 @@
<version>2.22</version>
</dependency>
<dependency>
- <!-- remove me after BluePrint clean up -->
- <groupId>com.thinkaurelius.titan</groupId>
- <artifactId>titan-core</artifactId>
- <version>0.4.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <!-- remove me after BluePrint clean up -->
- <groupId>com.tinkerpop</groupId>
- <artifactId>frames</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <!-- remove me after BluePrint clean up -->
- <groupId>com.tinkerpop.blueprints</groupId>
- <artifactId>blueprints-core</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <!-- remove me after BluePrint clean up -->
- <groupId>com.tinkerpop.rexster</groupId>
- <artifactId>rexster-core</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>2.5.0</version>
@@ -579,7 +546,6 @@
<version>14.0.1</version>
</dependency>
<dependency>
- <!-- Used in net.onrc.onos.ofcontroller.bgproute.RestClient.get(String), but not sure if it is really required -->
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
@@ -588,6 +554,23 @@
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<version>3.4.5</version>
+ <scope>runtime</scope>
+ <!-- Following workaround exclusions can be removed,
+ when we're ready to switch to ZooKeeper 3.4.6 -->
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- Floodlight's dependencies -->
<dependency>