Merge "Import only mockito-core instead of mockito-all"

[lispflowmapping.git] / mappingservice / implementation / pom.xml

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 161ffcd21a19c63c47cac75a80d7a1216fbaec52..d143432d13114f5520965d409a88966400b095db 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -3,94 +3,67 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <relativePath/>
+    <groupId>org.opendaylight.lispflowmapping</groupId>
+    <artifactId>mappingservice-parent</artifactId>
+    <version>1.4.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>mappingservice.implementation</artifactId>
-  <groupId>org.opendaylight.lispflowmapping</groupId>
-  <version>1.3.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
-  <name>LISP Flow Mapping Implementation</name>
+  <name>Mapping Service Implementation</name>
 
   <dependencies>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>common.unittest.tools</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.api</artifactId>
-      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.yangmodel</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
-    <!-- needed for osgi console -->
-    <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
-    </dependency>
-
-    <!-- testing dependencies -->
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
+      <artifactId>mappingservice.lisp-proto</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mappingservice.mapcache</artifactId>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>common.unittest.tools</artifactId>
     </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-junit4</artifactId>
-      <version>2.6.0</version>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-api-mockito</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-legacy</artifactId>
-      <version>2.6.0</version>
+      <groupId>org.powermock</groupId>
+      <artifactId>powermock-module-junit4</artifactId>
       <scope>test</scope>
     </dependency>
+    <!-- needed for osgi console -->
+    <dependency>
+      <groupId>org.eclipse.tycho</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+    </dependency>
   </dependencies>
 
-  <build>
-     <plugins>
-        <!-- We still need the activator for interacting with services that rely on activators for 
-             service discovery, but it should be deprecated soon -->
-       <plugin>
-         <groupId>org.apache.felix</groupId>
-         <artifactId>maven-bundle-plugin</artifactId>
-         <extensions>true</extensions>
-         <configuration>
-           <instructions>
-             <Export-Package>
-               org.opendaylight.lispflowmapping.implementation,
-               org.opendaylight.lispflowmapping.implementation.serializer,
-               org.opendaylight.lispflowmapping.implementation.util
-             </Export-Package>
-             <Bundle-Activator>org.opendaylight.lispflowmapping.implementation.Activator</Bundle-Activator>
-           </instructions>
-         </configuration>
-       </plugin>
-     </plugins>
-   </build>
+  <!--
+      Maven Site Configuration
+
+      The following configuration is necessary for maven-site-plugin to
+      correctly identify the correct deployment path for OpenDaylight Maven
+      sites.
+  -->
+  <url>${odl.site.url}/${project.groupId}/${stream}/${project.artifactId}/</url>
+
+  <distributionManagement>
+    <site>
+      <id>opendaylight-site</id>
+      <url>${nexus.site.url}/${project.artifactId}/</url>
+    </site>
+  </distributionManagement>
+
 </project>