commit e6f8400f83f029d72b21e38312a53d226c15990a
author Jonathan Hart <jono@onlab.us> Thu Feb 19 10:24:28 2015 -0800
committer Jonathan Hart <jono@onlab.us> Fri Feb 20 19:08:00 2015 +0000
tree 0df145f8dacce1b64608d32393414bcf40ba5250
parent d2c7ad2068b130a8b4033be246b27c8e6d9199b2

Cleaned up dependencies after routing code shuffle.

Change-Id: I1388749f77ef9b3b327df2ee745fdb7cec510708

apps/bgprouter/pom.xml

diff --git a/apps/bgprouter/pom.xml b/apps/bgprouter/pom.xml
index 0dbdf31..f5c63db 100644
--- a/apps/bgprouter/pom.xml
+++ b/apps/bgprouter/pom.xml
@@ -39,23 +39,12 @@
 
         <dependency>
             <groupId>org.onosproject</groupId>
-            <artifactId>onos-cli</artifactId>
-            <version>${project.version}</version>
+            <artifactId>onlab-misc</artifactId>
         </dependency>
 
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
     </dependencies>
 </project>

apps/routing-api/pom.xml

diff --git a/apps/routing-api/pom.xml b/apps/routing-api/pom.xml
index c83cb8f..8441994 100644
--- a/apps/routing-api/pom.xml
+++ b/apps/routing-api/pom.xml
@@ -33,6 +33,21 @@
     <dependencies>
         <dependency>
             <groupId>org.onosproject</groupId>
+            <artifactId>onlab-misc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
             <artifactId>onlab-junit</artifactId>
             <scope>test</scope>
         </dependency>

apps/routing/pom.xml

diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index e05bed1..4c3179f 100644
--- a/apps/routing/pom.xml
+++ b/apps/routing/pom.xml
@@ -46,7 +46,21 @@
 	    <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onlab-thirdparty</artifactId>
-            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.onosproject</groupId>
+            <artifactId>onlab-misc</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
 
         <dependency>
@@ -55,6 +69,17 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+            <version>3.9.0.Final</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.compendium</artifactId>
         </dependency>

apps/sdnip/pom.xml

diff --git a/apps/sdnip/pom.xml b/apps/sdnip/pom.xml
index 48a486e..20972c5 100644
--- a/apps/sdnip/pom.xml
+++ b/apps/sdnip/pom.xml
@@ -33,28 +33,11 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-databind</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.core</groupId>
-      <artifactId>jackson-annotations</artifactId>
-      <version>2.4.2</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.0</version>
-    </dependency>
-
-    <dependency>
       <groupId>org.onosproject</groupId>
       <artifactId>onlab-misc</artifactId>
     </dependency>