Cleanup samples/toaster-consumer/pom.xml

Do not depend on aggreator pom.

Change-Id: I6d4fed36ed5c32eb6a1523c81003f34e373ca52d
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/md-sal/samples/toaster-consumer/pom.xml b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
index e0578357542c80bf6f5857c1f72f10ee5d1fb93a..2694ebd095c3484dd3a2177a983fe4323401f3e9 100644 (file)
--- a/opendaylight/md-sal/samples/toaster-consumer/pom.xml
+++ b/opendaylight/md-sal/samples/toaster-consumer/pom.xml
@@ -2,17 +2,33 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>

-    <groupId>org.opendaylight.controller.samples</groupId>
-    <artifactId>sal-samples</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>1.8.0-SNAPSHOT</version>
+    <relativePath/>

   </parent>
   </parent>

+
+  <groupId>org.opendaylight.controller.samples</groupId>

   <artifactId>sample-toaster-consumer</artifactId>
   <artifactId>sample-toaster-consumer</artifactId>

+  <version>1.5.0-SNAPSHOT</version>

   <packaging>bundle</packaging>
 
   <properties>
     <sal-binding-api.version>1.5.0-SNAPSHOT</sal-binding-api.version>
   </properties>
 
   <packaging>bundle</packaging>
 
   <properties>
     <sal-binding-api.version>1.5.0-SNAPSHOT</sal-binding-api.version>
   </properties>
 

+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-artifacts</artifactId>
+        <version>1.5.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+

   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>
   <dependencies>
     <dependency>
       <groupId>${project.groupId}</groupId>


@@ -37,14 +53,6 @@
     </dependency>
   </dependencies>
 
     </dependency>
   </dependencies>
 

-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </build>

   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
   <scm>
     <connection>scm:git:http://git.opendaylight.org/gerrit/controller.git</connection>
     <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>