Move config-parent to aggregator POM

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

diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml
index 161ffcd21a19c63c47cac75a80d7a1216fbaec52..e95989541a12d70430edec7c763ce5bf6acd8781 100644 (file)
--- a/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@ -3,24 +3,18 @@
   <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.3.0-SNAPSHOT</version>
   </parent>
 
-  <artifactId>mappingservice.implementation</artifactId>
   <groupId>org.opendaylight.lispflowmapping</groupId>
+  <artifactId>mappingservice.implementation</artifactId>
   <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>
@@ -32,50 +26,21 @@
       <version>${project.version}</version>
     </dependency>
 
-    <!-- needed for osgi console -->
+    <!-- needed for activator -->
     <dependency>
-      <groupId>equinoxSDK381</groupId>
-      <artifactId>org.eclipse.osgi</artifactId>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
     </dependency>
 
-    <!-- testing dependencies -->
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <scope>test</scope>
-    </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.jmock</groupId>
-      <artifactId>jmock-junit4</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
-    </dependency>
+    <!-- needed for osgi console -->
     <dependency>
-      <groupId>org.jmock</groupId>
-      <artifactId>jmock-legacy</artifactId>
-      <version>2.6.0</version>
-      <scope>test</scope>
+      <groupId>equinoxSDK381</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>
@@ -87,7 +52,6 @@
                org.opendaylight.lispflowmapping.implementation.serializer,
                org.opendaylight.lispflowmapping.implementation.util
              </Export-Package>
-             <Bundle-Activator>org.opendaylight.lispflowmapping.implementation.Activator</Bundle-Activator>
            </instructions>
          </configuration>
        </plugin>