Remove unneeded dependencies from POM files

Change-Id: I1bf2bacca89d89dd89b7353818fab9c0920815a5
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 8edecdee484904c9e47fa469333490b309733851..96f1942ad11df7fbf5d49539fb34474c91edd3f0 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -76,7 +76,7 @@
       </dependency>
       <dependency>
         <groupId>org.jmock</groupId>
-        <artifactId>jmock-junit4</artifactId>
+        <artifactId>jmock</artifactId>
         <version>2.6.0</version>
       </dependency>
       <dependency>

diff --git a/commons/unittest_tools/pom.xml b/commons/unittest_tools/pom.xml
index c7cf9f3f99a57fc19fa3a596c0e70cca86ba31af..2284d9fc56adfb06c83cad4091c33f00b314e120 100644 (file)
--- a/commons/unittest_tools/pom.xml
+++ b/commons/unittest_tools/pom.xml
@@ -13,17 +13,10 @@
   <name>Unit Test Tools</name>
 
   <dependencies>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit-addons</groupId>
-      <artifactId>junit-addons</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
@@ -31,7 +24,7 @@
     </dependency>
     <dependency>
       <groupId>org.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
+      <artifactId>jmock</artifactId>
     </dependency>
     <dependency>
       <groupId>org.jmock</groupId>

diff --git a/features/pom.xml b/features/pom.xml
index 29375eaf2b1aa8e3ddf1c7a3e15c565547b41633..21f8607967ea4cee14c7fd4c7654b22f4e63340c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -175,11 +175,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

diff --git a/mappingservice/api/pom.xml b/mappingservice/api/pom.xml
index 36056398ef26a1f2cd13e133e5dd22955a349dce..96c6ee5e71e96e7d3e44cf4a2da978c7cf9e6349 100644 (file)
--- a/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@ -13,25 +13,17 @@
   <name>Mapping Service Public APIs</name>
 
   <dependencies>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-binding-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal-common-util</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.lisp-proto</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
+      <artifactId>yang-ext</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-yang-types</artifactId>
+      <artifactId>ietf-inet-types</artifactId>
     </dependency>
   </dependencies>
 </project>

diff --git a/mappingservice/clusterdao/pom.xml b/mappingservice/clusterdao/pom.xml
index be5b9b42ae17e9ef039afc4aa98b3e8f6840ec17..c2948ead3d71e849fb0c4cdff2a8484007edc779 100644 (file)
--- a/mappingservice/clusterdao/pom.xml
+++ b/mappingservice/clusterdao/pom.xml
@@ -23,10 +23,6 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.dependencymanager</artifactId>
     </dependency>
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>clustering.services</artifactId>

diff --git a/mappingservice/config/pom.xml b/mappingservice/config/pom.xml
index 23b90cedac64115539224e50d5b754061c6c3e71..720de2f1f3394072cb94eca834cb96474f0d8856 100644 (file)
--- a/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@ -31,14 +31,6 @@
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-common</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-yang-types</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <pluginManagement>

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index b637bf172f20a5ef6f6c12dca797f4b777c10ee4..8dfe7354709ed9225970a4bccf656742ca21a4e5 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -16,14 +16,19 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.lisp-proto</artifactId>
-      <version>${project.version}</version>
     </dependency>
-
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>common.unittest.tools</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit-addons</groupId>
+      <artifactId>junit-addons</artifactId>
+    </dependency>
     <!-- needed for osgi console -->
     <dependency>
       <groupId>equinoxSDK381</groupId>

diff --git a/mappingservice/inmemorydb/pom.xml b/mappingservice/inmemorydb/pom.xml
index 591b527f1ece23af351cb83aeab6a49483d5d277..a2f2b1b1b9ae80b5e53c3b99e263066714bd89e1 100644 (file)
--- a/mappingservice/inmemorydb/pom.xml
+++ b/mappingservice/inmemorydb/pom.xml
@@ -16,7 +16,6 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
-      <version>${project.version}</version>
     </dependency>
   </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/mappingservice/integrationtest/pom.xml b/mappingservice/integrationtest/pom.xml
index c54d9391b34e8b38026fa3a9209484f447227aab..f20f6e30c8ea2550caadf73337b8b8ab22c147d3 100644 (file)
--- a/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@ -36,15 +36,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>features-lispflowmapping</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <!--
+         Will need to add this back once we create tests over HTTP
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit-dep</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
+    -->
   </dependencies>
 </project>

diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml
index 96745b5f304350329d572e8dd96dad4b3830e487..e5ba102e9aa3ef23e79460d566ce9b527efd10d9 100644 (file)
--- a/mappingservice/lisp-proto/pom.xml
+++ b/mappingservice/lisp-proto/pom.xml
@@ -20,7 +20,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <artifactId>mappingservice.lisp-proto</artifactId>
   <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>Mapping Service LISP protocol</name>
+  <name>Mapping Service LISP Protocol</name>
 
   <dependencies>
     <dependency>
@@ -31,10 +31,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.yangtools.model</groupId>
       <artifactId>ietf-yang-types</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>yang-ext</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
@@ -44,5 +40,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>common.unittest.tools</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>junit-addons</groupId>
+      <artifactId>junit-addons</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 17b077bd25f1f196d62c67b21b6eace971b0a2fb..bd3d187dafd07ea11b2a93e4552f1ccc264799b6 100644 (file)
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -27,10 +27,6 @@
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>neutron-spi</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.yangtools.model</groupId>
-      <artifactId>ietf-inet-types</artifactId>
-    </dependency>
     <!-- needed for activator -->
     <dependency>
       <groupId>org.apache.felix</groupId>
@@ -46,9 +42,8 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Export-Package></Export-Package>
             <Bundle-Activator>org.opendaylight.lispflowmapping.neutron.Activator</Bundle-Activator>
-            <Export-Package></Export-Package>
+            <Export-Package/>
           </instructions>
           <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
         </configuration>

diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml
index b5325fcf1ca7bf3a3b2eab6378721737e6658650..d72f76777821a41c200b1822b45a8e7234cfe89e 100644 (file)
--- a/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@ -24,7 +24,6 @@
     <module>implementation</module>
     <module>southbound</module>
     <module>neutron</module>
-    <!-- <module>netconf</module> -->
     <module>shell</module>
   </modules>
 
@@ -37,6 +36,25 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>${project.groupId}</groupId>
+        <artifactId>common.unittest.tools</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>junit-addons</groupId>
+        <artifactId>junit-addons</artifactId>
+        <version>1.4</version>
+        <scope>test</scope>
+      </dependency>
+      <!--
+      <dependency>
+        <groupId>org.jmock</groupId>
+        <artifactId>jmock</artifactId>
+        <version>2.6.0</version>
+        <scope>test</scope>
+      </dependency>
+      -->
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>neutron-spi</artifactId>
@@ -47,50 +65,9 @@
         <artifactId>sal</artifactId>
         <version>0.10.0-SNAPSHOT</version>
       </dependency>
-<!--       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal-netconf-connector</artifactId>
-        <version>${mdsal.version}</version>
-      </dependency> -->
     </dependencies>
   </dependencyManagement>
 
-  <!-- common testing dependencies -->
-  <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>common.unittest.tools</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit-addons</groupId>
-      <artifactId>junit-addons</artifactId>
-      <version>1.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-legacy</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
   <build>
     <pluginManagement>
       <plugins>

diff --git a/mappingservice/shell/pom.xml b/mappingservice/shell/pom.xml
index e78661bb9ed3dedebdabddde91672f2ed17eda50..391e20098d98ca5f755c2b332be94da3d8e4f71b 100644 (file)
--- a/mappingservice/shell/pom.xml
+++ b/mappingservice/shell/pom.xml
@@ -17,7 +17,7 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
-      <artifactId>org.apache.karaf.shell.commands</artifactId>
+      <artifactId>org.apache.karaf.shell.console</artifactId>
       <version>${karaf.version}</version>
     </dependency>
     <dependency>

diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml
index c52ee171961f4f20ee3d99199ca512364b0376d0..64d4b0238ea69ad85bccde2ae51663a0ab9e3c5a 100644 (file)
--- a/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@ -16,12 +16,14 @@
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.lisp-proto</artifactId>
-      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>junit-addons</groupId>
+      <artifactId>junit-addons</artifactId>
     </dependency>
   </dependencies>
 </project>